From 3d71025331903ce789a4399f9df177379eb528b3 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 5 Jan 2020 14:00:08 -0500 Subject: [PATCH] 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. --- create_arm_image.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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"