summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-04-01 10:58:47 +0100
committerRaphaƫl Hertzog <hertzog@debian.org>2020-04-23 15:54:19 +0200
commit6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4 (patch)
treec91a79037457e7bb2c0630fa8c065bee6c465bad /scripts/build
parent6def2c27be28169cf3e0757a6928e3f13de157a8 (diff)
downloadvyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.tar.gz
vyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.zip
rename LB_ARCHITECTURES to LB_ARCHITECTURE
this was previously not done in 8b109ffb96282a6dd1aa5d61aa935bcba69c56f1 to keep the renaming simple, but leaving the variable plural is a cause for confusion. since this property is stored in the INI style config/build config file rather than a shell script based one, at the property there is already singular, there was no need for a backwards compatibility hack. Gbp-Dch: Short
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/binary_checksums2
-rwxr-xr-xscripts/build/binary_disk8
-rwxr-xr-xscripts/build/binary_grub-efi6
-rwxr-xr-xscripts/build/binary_hdd2
-rwxr-xr-xscripts/build/binary_iso4
-rwxr-xr-xscripts/build/binary_linux-image2
-rwxr-xr-xscripts/build/binary_loadlin2
-rwxr-xr-xscripts/build/binary_manifest4
-rwxr-xr-xscripts/build/binary_memtest2
-rwxr-xr-xscripts/build/binary_netboot12
-rwxr-xr-xscripts/build/binary_onie4
-rwxr-xr-xscripts/build/binary_package-lists8
-rwxr-xr-xscripts/build/binary_rootfs2
-rwxr-xr-xscripts/build/binary_syslinux3
-rwxr-xr-xscripts/build/binary_tar12
-rwxr-xr-xscripts/build/binary_win32-loader12
-rwxr-xr-xscripts/build/binary_zsync10
-rwxr-xr-xscripts/build/bootstrap_debootstrap6
-rwxr-xr-xscripts/build/build2
-rwxr-xr-xscripts/build/chroot_archives4
-rwxr-xr-xscripts/build/chroot_package-lists4
-rwxr-xr-xscripts/build/config8
-rwxr-xr-xscripts/build/installer_debian-installer42
-rwxr-xr-xscripts/build/source_debian2
24 files changed, 81 insertions, 82 deletions
diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums
index 07df5f82f..2797fa7f7 100755
--- a/scripts/build/binary_checksums
+++ b/scripts/build/binary_checksums
@@ -75,7 +75,7 @@ done
# File list
cd binary
-find . | sed -e 's|^.||g' | grep "^/" | sort > ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.contents
+find . | sed -e 's|^.||g' | grep "^/" | sort > ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.contents
cd "${OLDPWD}"
# Creating stage file
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index 0e56eb8ef..ca89ba599 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -38,7 +38,7 @@ Acquire_lockfile
mkdir -p binary/.disk
-ARCHITECTURE="$(echo ${LB_ARCHITECTURES} | sed -e 's| |/|g')"
+ARCHITECTURE="$(echo ${LB_ARCHITECTURE} | sed -e 's| |/|g')"
DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} | cut -b 1 | tr '[a-z]' '[A-Z]')"
DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION_BINARY} | cut -b 2-)"
@@ -135,13 +135,13 @@ do
then
case "${LB_DEBIAN_INSTALLER}" in
cdrom)
- cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include
+ cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURE}_udeb_include" binary/.disk/udeb_include
;;
netinst|live)
- cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include
+ cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURE}_netinst_udeb_include" binary/.disk/udeb_include
;;
businesscard)
- cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include
+ cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURE}_businesscard_udeb_include" binary/.disk/udeb_include
;;
none|netboot)
;;
diff --git a/scripts/build/binary_grub-efi b/scripts/build/binary_grub-efi
index d1a9ff91d..d94f8bfd3 100755
--- a/scripts/build/binary_grub-efi
+++ b/scripts/build/binary_grub-efi
@@ -43,7 +43,7 @@ Check_architectures amd64 i386 arm64 armhf
Check_crossarchitectures
# Checking depends
-case "${LB_ARCHITECTURES}" in
+case "${LB_ARCHITECTURE}" in
amd64|i386)
Check_package chroot /usr/lib/grub/x86_64-efi/configfile.mod grub-efi-amd64-bin
Check_package chroot /usr/lib/grub/i386-efi/configfile.mod grub-efi-ia32-bin
@@ -62,7 +62,7 @@ Check_package chroot /sbin/mkfs.msdos dosfstools
# Check UEFI Secure Boot setting and depends
# By default (auto) do a best-effort build: if the signed binaries are available use
# them, but don't fail if they are not, just print a warning.
-case "${LB_ARCHITECTURES}" in
+case "${LB_ARCHITECTURE}" in
amd64|i386)
_SB_EFI_PLATFORM="x86_64"
_SB_EFI_NAME="x64"
@@ -195,7 +195,7 @@ fi
PATH="${PATH}:\${LIVE_BUILD_PATH}" # Make sure grub-cpmodules is used as if it was installed in the system
-case "${LB_ARCHITECTURES}" in
+case "${LB_ARCHITECTURE}" in
amd64|i386)
gen_efi_boot_img "x86_64-efi" "x64" "debian-live/amd64"
gen_efi_boot_img "i386-efi" "ia32" "debian-live/i386"
diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd
index 19f7b23ae..5a5abc977 100755
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@@ -344,7 +344,7 @@ if $MAKEDEV; then
mv chroot/dev.tmp chroot/dev
fi
-mv chroot/binary.img ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.img
+mv chroot/binary.img ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.img
# Saving cache
Save_package_cache binary
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index 9f1b11a86..f2a166cf7 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -23,11 +23,11 @@ Init_config_data "${@}"
case "${LIVE_IMAGE_TYPE}" in
iso)
- IMAGE="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.iso"
+ IMAGE="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.iso"
;;
iso-hybrid)
- IMAGE="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.hybrid.iso"
+ IMAGE="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.hybrid.iso"
;;
*)
diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image
index ad3913ca4..503ac94c6 100755
--- a/scripts/build/binary_linux-image
+++ b/scripts/build/binary_linux-image
@@ -47,7 +47,7 @@ case "${LB_INITRAMFS}" in
;;
esac
-case "${LB_ARCHITECTURES}" in
+case "${LB_ARCHITECTURE}" in
powerpc)
LINUX="vmlinux"
;;
diff --git a/scripts/build/binary_loadlin b/scripts/build/binary_loadlin
index 367639925..0487d4d24 100755
--- a/scripts/build/binary_loadlin
+++ b/scripts/build/binary_loadlin
@@ -37,7 +37,7 @@ Check_stagefile
# Acquire lock file
Acquire_lockfile
-case "${LB_ARCHITECTURES}" in
+case "${LB_ARCHITECTURE}" in
amd64|i386)
# Checking depends
Check_package chroot /usr/lib/loadlin/loadlin.exe.gz loadlin
diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest
index 3f2d2e4b6..eb85ef181 100755
--- a/scripts/build/binary_manifest
+++ b/scripts/build/binary_manifest
@@ -54,9 +54,9 @@ cp chroot.packages.live "binary/${INITFS}/filesystem.${SUFFIX}"
echo "$(diff chroot.packages.live chroot.packages.install | awk '/^< / { print $2 }')" \
> "binary/${INITFS}/filesystem.${SUFFIX}-remove"
-cp chroot.packages.live ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.packages
+cp chroot.packages.live ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.packages
-cp chroot.files ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.files
+cp chroot.files ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.files
# Creating stage file
Create_stagefile
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index ec260c677..2ad1f10cf 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -37,7 +37,7 @@ Check_stagefile
# Acquire lock file
Acquire_lockfile
-if [ "${LB_ARCHITECTURES}" != "amd64" ] && [ "${LB_ARCHITECTURES}" != "i386" ]
+if [ "${LB_ARCHITECTURE}" != "amd64" ] && [ "${LB_ARCHITECTURE}" != "i386" ]
then
Echo_warning "Skipping binary_memtest, foreign architecture."
exit 0
diff --git a/scripts/build/binary_netboot b/scripts/build/binary_netboot
index 0847bdc60..14a6d9bc3 100755
--- a/scripts/build/binary_netboot
+++ b/scripts/build/binary_netboot
@@ -42,7 +42,7 @@ Check_stagefile
Acquire_lockfile
# Remove old binary
-rm -f ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.gz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.bz2 ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.xz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.xz
+rm -f ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar.gz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar.bz2 ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar.xz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar.xz
# Creating image file
ROOT_DIR=${LB_MODE}-live
@@ -57,23 +57,23 @@ cd binary.tmp
mkdir tftpboot/live
mv */live/vmlinuz* */live/initrd* tftpboot/live
-tar cf ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar *
+tar cf ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar *
case "${LB_COMPRESSION}" in
bzip2)
- bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar
+ bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar
;;
gzip)
- gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar
+ gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar
;;
lzip)
- lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar
+ lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar
;;
xz)
- xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar
+ xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar
;;
none)
diff --git a/scripts/build/binary_onie b/scripts/build/binary_onie
index dcc32bd07..fcc74b569 100755
--- a/scripts/build/binary_onie
+++ b/scripts/build/binary_onie
@@ -29,10 +29,10 @@ fi
case "${LIVE_IMAGE_TYPE}" in
iso)
- IMAGE="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.iso"
+ IMAGE="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.iso"
;;
iso-hybrid)
- IMAGE="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.hybrid.iso"
+ IMAGE="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.hybrid.iso"
;;
*)
exit 0
diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
index 2cbadce61..60ec76b7b 100755
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -132,9 +132,9 @@ then
SECTION="$(basename ${SECTION})"
- mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}
- apt-ftparchive packages ${POOL}/${SECTION} > ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages
- gzip -9 -c ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz
+ mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURE}
+ apt-ftparchive packages ${POOL}/${SECTION} > ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURE}/Packages
+ gzip -9 -c ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURE}/Packages > ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURE}/Packages.gz
done
if [ -d dists/${LB_PARENT_DISTRIBUTION_BINARY} ]; then
@@ -145,7 +145,7 @@ then
${_LB_APT_VERSION_OPT} \
-o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION_BINARY}" \
-o APT::FTPArchive::Release::Date="$(date -R)" \
- -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \
+ -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURE}" \
-o APT::FTPArchive::Release::Components="${LB_PARENT_ARCHIVE_AREAS}" \
-o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \
release dists/${LB_PARENT_DISTRIBUTION_BINARY} \
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index a4eb7e5ea..c6b329fbf 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -32,7 +32,7 @@ Check_stagefile
# Acquire lock file
Acquire_lockfile
-case "${LB_ARCHITECTURES}" in
+case "${LB_ARCHITECTURE}" in
amd64|i386)
LINUX="vmlinuz"
;;
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 86488fec4..ad9db9a83 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -198,7 +198,6 @@ fi
_VERSION="${_VERSION:-none}"
_DISTRIBUTION="${LB_DISTRIBUTION_BINARY}"
-_ARCHITECTURE="${LB_ARCHITECTURES}"
_DATE=$(date -R)
_YEAR="$(date +%Y)"
@@ -228,7 +227,7 @@ do
-e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \
-e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION_BINARY}|g" \
-e "s|@VERSION@|${_VERSION}|g" \
- -e "s|@ARCHITECTURE@|${_ARCHITECTURE}|g" \
+ -e "s|@ARCHITECTURE@|${LB_ARCHITECTURE}|g" \
-e "s|@DATE@|${_DATE}|g" \
-e "s|@YEAR@|${_YEAR}|g" \
-e "s|@MONTH@|${_MONTH}|g" \
diff --git a/scripts/build/binary_tar b/scripts/build/binary_tar
index 23bcbf6f0..fba1486ed 100755
--- a/scripts/build/binary_tar
+++ b/scripts/build/binary_tar
@@ -37,25 +37,25 @@ Check_stagefile
Acquire_lockfile
# Remove old binary
-rm -f ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.bz2 ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.gz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.lz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar
+rm -f ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.bz2 ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.gz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.lz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar
-tar cf ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar binary
+tar cf ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.tar binary
case "${LB_COMPRESSION}" in
bzip2)
- bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar
+ bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.tar
;;
gzip)
- gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar
+ gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.tar
;;
lzip)
- lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar
+ lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.tar
;;
xz)
- xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar
+ xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar.tar
;;
none)
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index 16d81bc10..9dba191b6 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -39,7 +39,7 @@ Acquire_lockfile
RUN_LABEL="Run Debian GNU/Linux"
-case "${LB_ARCHITECTURES}" in
+case "${LB_ARCHITECTURE}" in
amd64|i386)
# Checking depends
Check_package chroot /usr/share/win32/win32-loader.exe win32-loader
@@ -80,18 +80,18 @@ EOF
cat > binary/win32-loader.ini << EOF
[installer]
kernel=linux
-arch=${LB_ARCHITECTURES}
+arch=${LB_ARCHITECTURE}
default_desktop=gnome
-${LB_ARCHITECTURES}/linux=install/vmlinuz
-${LB_ARCHITECTURES}/initrd=install/initrd.gz
+${LB_ARCHITECTURE}/linux=install/vmlinuz
+${LB_ARCHITECTURE}/initrd=install/initrd.gz
EOF
if [ -e binary/install/gtk ]
then
cat >> binary/win32-loader.ini << EOF
-${LB_ARCHITECTURES}/gtk/linux=install/vmlinuz
-${LB_ARCHITECTURES}/gtk/initrd=install/gtk/initrd.gz
+${LB_ARCHITECTURE}/gtk/linux=install/vmlinuz
+${LB_ARCHITECTURE}/gtk/initrd=install/gtk/initrd.gz
EOF
fi
diff --git a/scripts/build/binary_zsync b/scripts/build/binary_zsync
index ac5dd83c5..d8f1e645a 100755
--- a/scripts/build/binary_zsync
+++ b/scripts/build/binary_zsync
@@ -53,23 +53,23 @@ Install_package
case "${LIVE_IMAGE_TYPE}" in
iso)
- _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.iso"
+ _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.iso"
;;
iso-hybrid)
- _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.hybrid.iso"
+ _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.hybrid.iso"
;;
hdd)
- _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.img"
+ _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.img"
;;
netboot)
- _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar*"
+ _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar*"
;;
tar)
- _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar*"
+ _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.tar*"
;;
esac
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
index fd212bb1e..3ff20a70e 100755
--- a/scripts/build/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@@ -48,9 +48,9 @@ Acquire_lockfile
mkdir -p chroot
# Setting debootstrap options
-if [ -n "${LB_ARCHITECTURES}" ]
+if [ -n "${LB_ARCHITECTURE}" ]
then
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}"
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURE}"
fi
if [ "${LB_ARCHIVE_AREAS}" != "main" ]
@@ -95,7 +95,7 @@ fi
Echo_breakage "Running debootstrap... "
# Run appropriate bootstrap, i.e. foreign or regular bootstrap
-if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LB_ARCHITECTURES}" ]; then
+if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LB_ARCHITECTURE}" ]; then
if [ -n "${LB_BOOTSTRAP_QEMU_EXCLUDE}" ]
then
diff --git a/scripts/build/build b/scripts/build/build
index f8ee8988c..9d4d5521d 100755
--- a/scripts/build/build
+++ b/scripts/build/build
@@ -52,7 +52,7 @@ Init_config_data "${@}"
Validate_config
Echo_message "live-build ${LIVE_BUILD_VERSION}"
-Echo_message "Building for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system"
+Echo_message "Building for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURE} system"
# Stage #1: Bootstrap new root filesystem
lb bootstrap "${@}"
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index 4bec09384..399d4d439 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -123,9 +123,9 @@ case "${_ACTION}" in
fi
# Copy packages
- if Find_files config/packages.chroot/*_"${LB_ARCHITECTURES}".deb || Find_files config/packages/*_"${LB_ARCHITECTURES}".deb
+ if Find_files config/packages.chroot/*_"${LB_ARCHITECTURE}".deb || Find_files config/packages/*_"${LB_ARCHITECTURE}".deb
then
- for FILE in config/packages.chroot/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb
+ for FILE in config/packages.chroot/*_"${LB_ARCHITECTURE}".deb config/packages/*_"${LB_ARCHITECTURE}".deb
do
if [ -L "${FILE}" ]
then
diff --git a/scripts/build/chroot_package-lists b/scripts/build/chroot_package-lists
index e832ca8e8..735f152c8 100755
--- a/scripts/build/chroot_package-lists
+++ b/scripts/build/chroot_package-lists
@@ -79,9 +79,9 @@ done
for _PACKAGE_ARCHITECTURE in $(Discover_package_architectures "chroot/root/packages.chroot")
do
# If this is a foreign architecture, append to packages.foreign-architectures
- if [ "${_PACKAGE_ARCHITECTURE}" != "${LB_ARCHITECTURES}" ]
+ if [ "${_PACKAGE_ARCHITECTURE}" != "${LB_ARCHITECTURE}" ]
then
- Echo_message "Accepting foreign architecture: ${_PACKAGE_ARCHITECTURE}, live image architecture is: ${LB_ARCHITECTURES}"
+ Echo_message "Accepting foreign architecture: ${_PACKAGE_ARCHITECTURE}, live image architecture is: ${LB_ARCHITECTURE}"
echo "${_PACKAGE_ARCHITECTURE}" >> chroot/root/packages.foreign-architectures
fi
done
diff --git a/scripts/build/config b/scripts/build/config
index 674026212..797fa11ba 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -361,7 +361,7 @@ Local_arguments ()
;;
-a|--architecture|--architectures)
- LB_ARCHITECTURES="${2}"
+ LB_ARCHITECTURE="${2}"
shift 2
;;
@@ -966,10 +966,10 @@ fi
if [ ! -e config ]
then
- Echo_message "Creating config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system"
+ Echo_message "Creating config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURE} system"
mkdir config
else
- Echo_message "Updating config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system"
+ Echo_message "Updating config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURE} system"
fi
# Creating live-build configuration
@@ -1364,7 +1364,7 @@ fi
cat > config/build << EOF
[Image]
-Architecture: ${LB_ARCHITECTURES}
+Architecture: ${LB_ARCHITECTURE}
Archive-Areas: ${LB_ARCHIVE_AREAS}
Distribution-Chroot: ${LB_DISTRIBUTION_CHROOT}
Distribution-Binary: ${LB_DISTRIBUTION_BINARY}
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index 81beebeae..50ff5c980 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -62,7 +62,7 @@ fi
# Setting destination directory
case "${LIVE_IMAGE_TYPE}" in
netboot)
- DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURES}"
+ DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURE}"
;;
*)
@@ -89,7 +89,7 @@ case "${LB_DEBIAN_INSTALLER}" in
esac
# Set architecture-specific variables
-case "${LB_ARCHITECTURES}" in
+case "${LB_ARCHITECTURE}" in
armel)
DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
case "${DI_IMAGE_TYPE}" in
@@ -109,11 +109,11 @@ case "${LB_ARCHITECTURES}" in
powerpc)
case "${DI_IMAGE_TYPE}" in
cdrom)
- DI_REMOTE_BASE="${LB_ARCHITECTURES}/cdrom"
+ DI_REMOTE_BASE="${LB_ARCHITECTURE}/cdrom"
;;
netboot)
- DI_REMOTE_BASE="${LB_ARCHITECTURES}/netboot"
+ DI_REMOTE_BASE="${LB_ARCHITECTURE}/netboot"
;;
esac
@@ -124,8 +124,8 @@ case "${LB_ARCHITECTURES}" in
*)
case "${DI_IMAGE_TYPE}" in
netboot)
- DI_REMOTE_BASE="netboot/debian-installer/${LB_ARCHITECTURES}"
- DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LB_ARCHITECTURES}"
+ DI_REMOTE_BASE="netboot/debian-installer/${LB_ARCHITECTURE}"
+ DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LB_ARCHITECTURE}"
DI_REMOTE_KERNEL="linux"
;;
@@ -227,7 +227,7 @@ INITRD_GI="gtk/initrd.gz"
DESTDIR_GI="${DESTDIR}/gtk"
# Debian Installer daily builds
-DAILY_DI_URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily"
+DAILY_DI_URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURE}/daily"
case "${LB_DERIVATIVE}" in
false)
@@ -238,7 +238,7 @@ case "${LB_DERIVATIVE}" in
URL="${DAILY_DI_URL}"
else
- URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images"
+ URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURE}/current/images"
fi
;;
@@ -249,7 +249,7 @@ case "${LB_DERIVATIVE}" in
URL="${DAILY_DI_URL}"
else
- URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images"
+ URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURE}/current/images"
fi
esac
@@ -263,7 +263,7 @@ Download_file "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz
DOWNLOAD_GTK_INSTALLER=false
if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ]
then
- case "${LB_ARCHITECTURES}" in
+ case "${LB_ARCHITECTURE}" in
amd64|i386)
DOWNLOAD_GTK_INSTALLER=true
;;
@@ -289,7 +289,7 @@ then
# Downloading additional packages
mkdir -p chroot/binary.deb/archives/partial
- case "${LB_ARCHITECTURES}" in
+ case "${LB_ARCHITECTURE}" in
amd64)
DI_REQ_PACKAGES="lilo grub-pc"
DI_PACKAGES="linux-image-amd64"
@@ -429,9 +429,9 @@ then
Echo_debug "Including local debs"
# Including local debs
- if Find_files config/packages.binary/*_"${LB_ARCHITECTURES}".deb || Find_files config/packages/*_"${LB_ARCHITECTURES}".deb
+ if Find_files config/packages.binary/*_"${LB_ARCHITECTURE}".deb || Find_files config/packages/*_"${LB_ARCHITECTURE}".deb
then
- for FILE in config/packages.binary/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb
+ for FILE in config/packages.binary/*_"${LB_ARCHITECTURE}".deb config/packages/*_"${LB_ARCHITECTURE}".deb
do
if [ -e "${FILE}" ]
then
@@ -454,7 +454,7 @@ then
# Generating deb indices
Echo_debug "Generating deb indices"
for _ARCHIVE_AREA in $(cd binary/pool && ls); do
- INDICE_DIR="dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}"
+ INDICE_DIR="dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURE}"
mkdir -p "binary/${INDICE_DIR}"
mv binary chroot/root
@@ -497,12 +497,12 @@ EOF
# Downloading udeb indices
Echo_debug "Downloading udeb indices"
- Download_file Packages.gz "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz
+ Download_file Packages.gz "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURE}"/Packages.gz
gunzip -c Packages.gz > Packages
if [ "${LB_DERIVATIVE}" = "true" ]
then
- Download_file Packages.derivative.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz
+ Download_file Packages.derivative.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURE}"/Packages.gz
gunzip -c Packages.derivative.gz > Packages.derivative
fi
@@ -583,9 +583,9 @@ EOF
Echo_debug "Including local udebs"
# Including local udebs
- if Find_files ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb || Find_files ../config/packages/*_"${LB_ARCHITECTURES}".udeb
+ if Find_files ../config/packages.binary/*_"${LB_ARCHITECTURE}".udeb || Find_files ../config/packages/*_"${LB_ARCHITECTURE}".udeb
then
- for FILE in ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb ../config/packages/*_"${LB_ARCHITECTURES}".udeb
+ for FILE in ../config/packages.binary/*_"${LB_ARCHITECTURE}".udeb ../config/packages/*_"${LB_ARCHITECTURE}".udeb
do
if [ -e "${FILE}" ]
then
@@ -620,7 +620,7 @@ EOF
then
grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/udeb_exclude" > exclude || true
grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs" >> exclude || true
- grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs-${LB_ARCHITECTURES}" >> exclude || true
+ grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs-${LB_ARCHITECTURE}" >> exclude || true
continue
fi
@@ -657,7 +657,7 @@ EOF
# Creating udeb indices
Echo_debug "Generating udeb indices"
- UDEB_INDICE_DIR="dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}"
+ UDEB_INDICE_DIR="dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURE}"
mkdir -p "${UDEB_INDICE_DIR}"
@@ -715,7 +715,7 @@ cd /root/binary && apt-ftparchive \
${_LB_APT_VERSION_OPT} \
-o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION_BINARY}" \
-o APT::FTPArchive::Release::Date="$(date -R)" \
- -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \
+ -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURE}" \
-o APT::FTPArchive::Release::Components="${LB_PARENT_ARCHIVE_AREAS}" \
-o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \
release dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION} > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/Release
diff --git a/scripts/build/source_debian b/scripts/build/source_debian
index 21d4a3e5a..54e24f5c1 100755
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@@ -86,7 +86,7 @@ case "${LB_BINARY_FILESYSTEM}" in
;;
esac
-case "${LB_ARCHITECTURES}" in
+case "${LB_ARCHITECTURE}" in
amd64|i386)
echo "mtools" >> source-selection.txt
echo "syslinux" >> source-selection.txt