aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Gompa <ngompa13@gmail.com>2020-01-05 14:00:08 -0500
committerNeal Gompa <ngompa13@gmail.com>2020-01-05 14:11:26 -0500
commit3d71025331903ce789a4399f9df177379eb528b3 (patch)
tree6c4861f19491c4f5c19d5345475d2f7f1a94b3d0
parent58f1fc79751d8916a8d2d57fb0104e7750776b77 (diff)
downloadmageia4arm-3d71025331903ce789a4399f9df177379eb528b3.tar
mageia4arm-3d71025331903ce789a4399f9df177379eb528b3.tar.gz
mageia4arm-3d71025331903ce789a4399f9df177379eb528b3.tar.bz2
mageia4arm-3d71025331903ce789a4399f9df177379eb528b3.tar.xz
mageia4arm-3d71025331903ce789a4399f9df177379eb528b3.zip
Install u-boot only on armv7hl systems
U-Boot is not available for AArch64, so this causes basesystem setup to fail when producing AArch64 images.
-rwxr-xr-xcreate_arm_image.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/create_arm_image.sh b/create_arm_image.sh
index 7fdf25b..039e5c8 100755
--- a/create_arm_image.sh
+++ b/create_arm_image.sh
@@ -229,11 +229,18 @@ function installbasesystem()
# error "line ${LINENO} error installing basesystem-minimal : exiting"
# exit ${ERR_1}
#fi
- /usr/bin/dnf --installroot="${BUILD_PATH}" ${DNF_MIRROROPTS} --assumeyes install dnf dnf-plugins-core locales u-boot
+ /usr/bin/dnf --installroot="${BUILD_PATH}" ${DNF_MIRROROPTS} --assumeyes install dnf dnf-plugins-core locales
if [ ${?} -ne 0 ]; then
error "line ${LINENO} error installing dnf or locales : exiting"
exit ${ERR_1}
fi
+ if [ "${ARM_VERSION}" = "armv7hl" ]; then
+ /usr/bin/dnf --installroot="${BUILD_PATH}" ${DNF_MIRROROPTS} --assumeyes install u-boot
+ if [ ${?} -ne 0 ]; then
+ error "line ${LINENO} error installing u-boot : exiting"
+ exit ${ERR_1}
+ fi
+ fi
/usr/bin/dnf --installroot="${BUILD_PATH}" ${DNF_MIRROROPTS} --assumeyes install urpmi
if [ ${?} -ne 0 ]; then
error "line ${LINENO} error installing urpmi : exiting"