diff options
| -rwxr-xr-x | functions/architectures.sh | 8 | ||||
| -rwxr-xr-x | functions/configuration.sh | 7 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 2 | ||||
| -rwxr-xr-x | scripts/build/config | 6 |
4 files changed, 14 insertions, 9 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:-}" } diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index 3ff20a70e..c438b8459 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -95,7 +95,7 @@ fi Echo_breakage "Running debootstrap... " # Run appropriate bootstrap, i.e. foreign or regular bootstrap -if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LB_ARCHITECTURE}" ]; then +if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURE}" = "${LB_ARCHITECTURE}" ]; then if [ -n "${LB_BOOTSTRAP_QEMU_EXCLUDE}" ] then diff --git a/scripts/build/config b/scripts/build/config index 797fa11ba..05239eae6 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -406,7 +406,7 @@ Local_arguments () ;; --bootstrap-qemu-arch) - LB_BOOTSTRAP_QEMU_ARCHITECTURES="${2}" + LB_BOOTSTRAP_QEMU_ARCHITECTURE="${2}" shift 2 ;; @@ -1126,8 +1126,8 @@ LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY}" # \$LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}" -# \$LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap -LB_BOOTSTRAP_QEMU_ARCHITECTURES="${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" +# \$LB_BOOTSTRAP_QEMU_ARCHITECTURE: architectures to use foreign bootstrap +LB_BOOTSTRAP_QEMU_ARCHITECTURE="${LB_BOOTSTRAP_QEMU_ARCHITECTURE}" # \$LB_BOOTSTRAP_QEMU_EXCLUDE: packages to exclude during foreign bootstrap LB_BOOTSTRAP_QEMU_EXCLUDE="${LB_BOOTSTRAP_QEMU_EXCLUDE}" |