diff options
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/architectures.sh | 8 | ||||
| -rwxr-xr-x | functions/configuration.sh | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/functions/architectures.sh b/functions/architectures.sh index 91c1b42cc..285c681d4 100755 --- a/functions/architectures.sh +++ b/functions/architectures.sh @@ -25,13 +25,13 @@ Check_architectures () fi done - if [ "${ARCHITECTURES}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ] + if [ "${ARCHITECTURES}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURE}" ] then VALID=true if [ ! -e "${LB_BOOTSTRAP_QEMU_STATIC}" ] then - Echo_warning "skipping %s, qemu-static binary ${LB_BOOTSTRAP_QEMU_ARCHITECTURES} was not found" + Echo_warning "skipping %s, qemu-static binary ${LB_BOOTSTRAP_QEMU_ARCHITECTURE} was not found" VALID=false fi @@ -75,12 +75,12 @@ Check_crossarchitectures () ;; esac - if [ "${LB_ARCHITECTURE}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ] + if [ "${LB_ARCHITECTURE}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURE}" ] then if [ ! -e "${LB_BOOTSTRAP_QEMU_STATIC}" ] then - Echo_warning "skipping %s, qemu-static binary ${LB_BOOTSTRAP_QEMU_ARCHITECTURES} was not found" + Echo_warning "skipping %s, qemu-static binary ${LB_BOOTSTRAP_QEMU_ARCHITECTURE} was not found" exit 0 fi diff --git a/functions/configuration.sh b/functions/configuration.sh index 6e8323f38..a39b9dfb0 100755 --- a/functions/configuration.sh +++ b/functions/configuration.sh @@ -480,7 +480,12 @@ Prepare_config () LB_SOURCE_IMAGES="$(echo "${LB_SOURCE_IMAGES}" | tr "," " ")" # Foreign/port bootstrapping - LB_BOOTSTRAP_QEMU_ARCHITECTURES="${LB_BOOTSTRAP_QEMU_ARCHITECTURES:-}" + if [ -n "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ]; then + LB_BOOTSTRAP_QEMU_ARCHITECTURE="${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" + unset LB_BOOTSTRAP_QEMU_ARCHITECTURES + Echo_warning "LB_BOOTSTRAP_QEMU_ARCHITECTURES was renamed to LB_BOOTSTRAP_QEMU_ARCHITECTURE, please updated your config." + fi + LB_BOOTSTRAP_QEMU_ARCHITECTURE="${LB_BOOTSTRAP_QEMU_ARCHITECTURE:-}" LB_BOOTSTRAP_QEMU_EXCLUDE="${LB_BOOTSTRAP_QEMU_EXCLUDE:-}" LB_BOOTSTRAP_QEMU_STATIC="${LB_BOOTSTRAP_QEMU_STATIC:-}" } |