summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-04-01 11:25:56 +0100
committerRaphaƫl Hertzog <hertzog@debian.org>2020-04-23 16:00:34 +0200
commit8ffe48d8f3825a3741deeb0a45e5372b5ed5504c (patch)
treedbad3fe8ffb17c1f0b69e021f6406433876a2ecc /scripts
parent047885bf7e5c3f527a44b0be5c73c2d1f027d300 (diff)
downloadvyos-live-build-8ffe48d8f3825a3741deeb0a45e5372b5ed5504c.tar.gz
vyos-live-build-8ffe48d8f3825a3741deeb0a45e5372b5ed5504c.zip
rename LB_BOOTSTRAP_QEMU_ARCHITECTURES to LB_BOOTSTRAP_QEMU_ARCHITECTURE
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/bootstrap_debootstrap2
-rwxr-xr-xscripts/build/config6
2 files changed, 4 insertions, 4 deletions
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}"