Renaming --architecture to --architectures in preparation for multi-arch.

22 files changed, 78 insertions, 78 deletions

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index fd79ee7b0..f5ea984da 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -81,7 +81,7 @@ Install_package
 # Setting destination directory
 case "${LB_BINARY_IMAGES}" in
 	net)
-		DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURE}"
+		DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURES}"
 		;;
 
 	usb*|tar)
@@ -112,15 +112,15 @@ case "${LB_DEBIAN_INSTALLER}" in
 esac
 
 # Set architecture-specific variables
-case "${LB_ARCHITECTURE}" in
+case "${LB_ARCHITECTURES}" in
 	powerpc)
 		case "${DI_IMAGE_TYPE}" in
 			cdrom)
-				DI_REMOTE_BASE="${LB_ARCHITECTURE}/cdrom"
+				DI_REMOTE_BASE="${LB_ARCHITECTURES}/cdrom"
 			;;
 
 			netboot)
-				DI_REMOTE_BASE="${LB_ARCHITECTURE}/netboot"
+				DI_REMOTE_BASE="${LB_ARCHITECTURES}/netboot"
 				;;
 		esac
 
@@ -138,8 +138,8 @@ case "${LB_ARCHITECTURE}" in
 	*)
 		case "${DI_IMAGE_TYPE}" in
 			netboot)
-				DI_REMOTE_BASE="netboot/debian-installer/${LB_ARCHITECTURE}"
-				DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LB_ARCHITECTURE}"
+				DI_REMOTE_BASE="netboot/debian-installer/${LB_ARCHITECTURES}"
+				DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LB_ARCHITECTURES}"
 				DI_REMOTE_KERNEL="linux"
 				;;
 
@@ -152,7 +152,7 @@ case "${LB_ARCHITECTURE}" in
 		;;
 esac
 
-Check_multiarchitecture
+Check_multiarchitectures
 
 Install_file() {
 	local FILE
@@ -231,9 +231,9 @@ then
 	LB_DEBIAN_INSTALLER_DISTRIBUTION="sid"
 
 	# Debian Installer daily builds
-	case "${LB_ARCHITECTURE}" in
+	case "${LB_ARCHITECTURES}" in
 		alpha|amd64|hppa|ia64|mips|mipsel|powerpc)
-			URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURE}/daily/"
+			URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
 			;;
 
 		arm|armel)
@@ -262,12 +262,12 @@ then
 			;;
 	esac
 else
-	URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURE}/current/images/"
+	URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
 fi
 
 mkdir -p "${DESTDIR_DI}"
 
-if [ "${LB_ARCHITECTURE}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ]
+if [ "${LB_ARCHITECTURES}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ]
 then
 	# There are no prepared kernel/initrd pairs for sparc netboot so we
 	# must unpack them from a mini.iso
@@ -290,7 +290,7 @@ else
 	DOWNLOAD_GTK_INSTALLER=0
 	if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ]
 	then
-		case "${LB_ARCHITECTURE}" in
+		case "${LB_ARCHITECTURES}" in
 			amd64|i386)
 				DOWNLOAD_GTK_INSTALLER=1
 				;;
@@ -321,7 +321,7 @@ then
 	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
 	touch chroot/var/lib/dpkg/status
 
-	case "${LB_ARCHITECTURE}" in
+	case "${LB_ARCHITECTURES}" in
 		amd64)
 			#DI_REQ_PACKAGES="lilo grub grub2"
 			DI_REQ_PACKAGES="lilo grub"
@@ -440,9 +440,9 @@ then
 	fi
 
 	# Including local debs
-	if Find_files config/binary_local-debs/*_"${LB_ARCHITECTURE}".deb
+	if Find_files config/binary_local-debs/*_"${LB_ARCHITECTURES}".deb
 	then
-		for FILE in config/binary_local-debs/*_"${LB_ARCHITECTURE}".deb
+		for FILE in config/binary_local-debs/*_"${LB_ARCHITECTURES}".deb
 		do
 			Install_file "${FILE}" "binary/pool/main"
 		done
@@ -457,24 +457,24 @@ then
 	fi
 
 	# Generating deb indices
-	mkdir -p binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURE}
+	mkdir -p binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}
 
 	mv binary chroot/root
-	echo "cd /root/binary && apt-ftparchive packages pool/main > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURE}/Packages" > chroot/binary.sh
+	echo "cd /root/binary && apt-ftparchive packages pool/main > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh
 	Chroot chroot "sh binary.sh"
 	rm -f chroot/binary.sh
 	mv chroot/root/binary ./
 
-	gzip -9 -c binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURE}/Packages > binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURE}/Packages.gz
+	gzip -9 -c binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Packages > binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Packages.gz
 
 	# Fetching release
-	Download_file binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURE}/Release "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/binary-"${LB_ARCHITECTURE}"/Release
+	Download_file binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Release "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/binary-"${LB_ARCHITECTURES}"/Release
 
 	mkdir binary.udeb
 	cd binary.udeb
 
 	# Downloading udeb indices
-	Download_file Packages.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURE}"/Packages.gz
+	Download_file Packages.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz
 	gunzip -c Packages.gz > Packages
 
 	# Sorting udebs
@@ -499,9 +499,9 @@ then
 	cp *.udeb ../cache/packages_debian-installer.udeb
 
 	# Including local udebs
-	if Find_files ../config/binary_local-udebs/*_"${LB_ARCHITECTURE}".udeb
+	if Find_files ../config/binary_local-udebs/*_"${LB_ARCHITECTURES}".udeb
 	then
-		for FILE in ../config/binary_local-udebs/*_"${LB_ARCHITECTURE}".udeb
+		for FILE in ../config/binary_local-udebs/*_"${LB_ARCHITECTURES}".udeb
 		do
 			Install_file "${FILE}" "pool/main"
 
@@ -524,7 +524,7 @@ then
 	# Excluding udebs
 	grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/udeb_exclude > exclude || true
 	grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs >> exclude || true
-	grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs-${LB_ARCHITECTURE} >> exclude || true
+	grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs-${LB_ARCHITECTURES} >> exclude || true
 
 	# Local exclude file
 	if [ -e ../config/binary_debian-installer/udeb_exclude ]
@@ -566,17 +566,17 @@ then
 	done
 
 	# Creating udeb indices
-	mkdir -p dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURE}"
+	mkdir -p dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"
 	cd "${OLDPWD}"
 
 	mv binary.udeb chroot/root
-	echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURE}/Packages" > chroot/binary.sh
+	echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh
 	Chroot chroot "sh binary.sh"
 	rm -f chroot/binary.sh
 	mv chroot/root/binary.udeb ./
 
 	cd binary.udeb
-	gzip -9 -c dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURE}/Packages > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURE}/Packages.gz
+	gzip -9 -c dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages.gz
 
 	rm -f Packages* exclude
 	find . | cpio -dmpu "${OLDPWD}"/binary
@@ -608,7 +608,7 @@ cd /root/binary && apt-ftparchive \
 	-o APT::FTPArchive::Release::Version="${_VERSION}" \
 	-o APT::FTPArchive::Release::Codename="${LB_DISTRIBUTION}" \
 	-o APT::FTPArchive::Release::Date="$(date -R)" \
-	-o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURE}" \
+	-o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \
 	-o APT::FTPArchive::Release::Components="main" \
 	-o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \
 	release dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION} > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/Release
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index 7a15c8d38..0e03bf6ed 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -48,7 +48,7 @@ Create_lockfile .lock
 
 mkdir -p binary/.disk
 
-ARCHITECTURE="$(echo ${LB_ARCHITECTURE} | sed -e 's| |/|g')"
+ARCHITECTURE="$(echo ${LB_ARCHITECTURES} | sed -e 's| |/|g')"
 DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
 DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)"
 eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
@@ -115,7 +115,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 
 		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
 
-		cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURE}_udeb_include binary/.disk/udeb_include
+		cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURES}_udeb_include binary/.disk/udeb_include
 		;;
 
 	true|netinst|live)
@@ -133,7 +133,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 
 		fi
 
-		cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include
+		cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include binary/.disk/udeb_include
 
 		if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
 		then
@@ -148,7 +148,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 
 		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
 
-		cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURE}_businesscard_udeb_include binary/.disk/udeb_include
+		cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURES}_businesscard_udeb_include binary/.disk/udeb_include
 		;;
 
 	false)
diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub
index 50bd94d3d..e2228a78d 100755
--- a/scripts/build/lb_binary_grub
+++ b/scripts/build/lb_binary_grub
@@ -47,8 +47,8 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Check architecture
-Check_architecture amd64 i386
-Check_crossarchitecture
+Check_architectures amd64 i386
+Check_crossarchitectures
 
 # Checking depends
 Check_package chroot/usr/sbin/grub grub-legacy
@@ -150,7 +150,7 @@ case "${LB_BINARY_IMAGES}" in
 	;;
 esac
 
-Check_multiarchitecture
+Check_multiarchitectures
 
 # Creating directory
 mkdir -p "${DESTDIR_LIVE}"
diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2
index 591b5f112..7228309e6 100755
--- a/scripts/build/lb_binary_grub2
+++ b/scripts/build/lb_binary_grub2
@@ -47,8 +47,8 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Check architecture
-Check_architecture amd64 i386
-Check_crossarchitecture
+Check_architectures amd64 i386
+Check_crossarchitectures
 
 # Checking depends
 Check_package chroot/usr/bin/grub-mkimage grub-pc
@@ -124,7 +124,7 @@ case "${LB_BINARY_IMAGES}" in
 	;;
 esac
 
-Check_multiarchitecture
+Check_multiarchitectures
 
 # Creating directory
 mkdir -p "${DESTDIR_LIVE}"
diff --git a/scripts/build/lb_binary_includes b/scripts/build/lb_binary_includes
index 43c7a9930..8f2666460 100755
--- a/scripts/build/lb_binary_includes
+++ b/scripts/build/lb_binary_includes
@@ -62,7 +62,7 @@ then
 fi
 
 # Assemble architecture
-case "${LB_ARCHITECTURE}" in
+case "${LB_ARCHITECTURES}" in
 	amd64)
 		ARCH="amd"
 		;;
@@ -133,7 +133,7 @@ then
 	fi
 
 	# Adjusting install templates
-	ARCHITECTURE="$(echo ${LB_ARCHITECTURE} | sed -e 's| |/|g')"
+	ARCHITECTURE="$(echo ${LB_ARCHITECTURES} | sed -e 's| |/|g')"
 	DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
 	DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)"
 	eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
@@ -148,7 +148,7 @@ then
 	DEBIAN_NAME="Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary $(date +%Y%m%d-%H:%M)"
 	DEBIAN_DATE="$(date +%Y%m%d-%H:%M)"
 
-	if [ "${LB_ARCHITECTURE}" = "i386" ]
+	if [ "${LB_ARCHITECTURES}" = "i386" ]
 	then
 		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt>&nbsp;\n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
 		DEBIAN_TOOLS_TXT="/tools/ and   /install/floppy/"
diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/lb_binary_linux-image
index 729b1600c..ff82c8686 100755
--- a/scripts/build/lb_binary_linux-image
+++ b/scripts/build/lb_binary_linux-image
@@ -57,7 +57,7 @@ case "${LB_INITRAMFS}" in
 		;;
 esac
 
-case "${LB_ARCHITECTURE}" in
+case "${LB_ARCHITECTURES}" in
 	powerpc)
 		LINUX="vmlinux"
 		;;
@@ -67,7 +67,7 @@ case "${LB_ARCHITECTURE}" in
 		;;
 esac
 
-Check_multiarchitecture
+Check_multiarchitectures
 
 # Creating directory
 mkdir -p "${DESTDIR}"
diff --git a/scripts/build/lb_binary_local-packagelists b/scripts/build/lb_binary_local-packagelists
index bd75628d8..745a43472 100755
--- a/scripts/build/lb_binary_local-packagelists
+++ b/scripts/build/lb_binary_local-packagelists
@@ -108,9 +108,9 @@ then
 	do
 		SECTION="$(basename ${SECTION})"
 
-		mkdir -p dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURE}
-		apt-ftparchive packages pool/${SECTION} > dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURE}/Packages
-		gzip -9 -c dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURE}/Packages > dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURE}/Packages.gz
+		mkdir -p dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}
+		apt-ftparchive packages pool/${SECTION} > dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages
+		gzip -9 -c dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz
 	done
 
 	cd "${OLDPWD}"
diff --git a/scripts/build/lb_binary_memtest b/scripts/build/lb_binary_memtest
index 01b301d20..fade917b8 100755
--- a/scripts/build/lb_binary_memtest
+++ b/scripts/build/lb_binary_memtest
@@ -43,7 +43,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ "${LB_ARCHITECTURE}" != "amd64" ] && [ "${LB_ARCHITECTURE}" != "i386" ]
+if [ "${LB_ARCHITECTURES}" != "amd64" ] && [ "${LB_ARCHITECTURES}" != "i386" ]
 then
 	Echo_warning "skipping binary_memtest, foreign architecture."
 	exit 0
@@ -89,7 +89,7 @@ case "${LB_INITRAMFS}" in
 		;;
 esac
 
-Check_multiarchitecture
+Check_multiarchitectures
 
 # Creating directory
 mkdir -p "${DESTDIR}"
diff --git a/scripts/build/lb_binary_net b/scripts/build/lb_binary_net
index 077a0237c..8ec5950b4 100755
--- a/scripts/build/lb_binary_net
+++ b/scripts/build/lb_binary_net
@@ -48,7 +48,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ "${LB_ARCHITECTURE}" = "sparc" ]
+if [ "${LB_ARCHITECTURES}" = "sparc" ]
 then
 	# Checking depends
 	Check_package chroot/usr/bin/elftoaout sparc-utils
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index b5ca06899..b2dabe4ce 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -38,7 +38,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-case "${LB_ARCHITECTURE}" in
+case "${LB_ARCHITECTURES}" in
 	amd64|i386)
 		LINUX="vmlinuz"
 		;;
diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo
index 7c0c6aea7..41df7f317 100755
--- a/scripts/build/lb_binary_silo
+++ b/scripts/build/lb_binary_silo
@@ -58,7 +58,7 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Check architecture
-Check_architecture sparc
+Check_architectures sparc
 
 # Checking depends
 Check_package chroot/usr/sbin/silo silo
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 0effa87af..557847587 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -44,8 +44,8 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Check architecture
-Check_architecture amd64 i386
-Check_crossarchitecture
+Check_architectures amd64 i386
+Check_crossarchitectures
 
 case "${LB_BUILD_WITH_CHROOT}" in
 	true)
diff --git a/scripts/build/lb_binary_usb b/scripts/build/lb_binary_usb
index ae78e7b53..506d9fb6d 100755
--- a/scripts/build/lb_binary_usb
+++ b/scripts/build/lb_binary_usb
@@ -48,7 +48,7 @@ Check_package chroot/sbin/mkdosfs dosfstools
 Check_package chroot/usr/share/doc/mtools mtools
 Check_package chroot/sbin/parted parted
 
-if [ "${LB_ARCHITECTURE}" = "sparc" ]
+if [ "${LB_ARCHITECTURES}" = "sparc" ]
 then
 	case "${LB_BINARY_FILESYSTEM}" in
 		ext2|ext3)
@@ -118,7 +118,7 @@ fi
 echo "!!! The following error/warning messages can be ignored !!!"
 Losetup $FREELO chroot/binary.img 0
 
-case "${LB_ARCHITECTURE}" in
+case "${LB_ARCHITECTURES}" in
 	sparc)
 		PARTITION_TABLE_TYPE="sun"
 		;;
diff --git a/scripts/build/lb_binary_win32-loader b/scripts/build/lb_binary_win32-loader
index d3a8bd8c6..4d6a6e2cf 100755
--- a/scripts/build/lb_binary_win32-loader
+++ b/scripts/build/lb_binary_win32-loader
@@ -43,7 +43,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-case "${LB_ARCHITECTURE}" in
+case "${LB_ARCHITECTURES}" in
 	amd64|i386)
 		if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
 		then
@@ -74,7 +74,7 @@ case "${LB_ARCHITECTURE}" in
 
 cat > binary/win32-loader.ini << EOF
 [installer]
-arch=${LB_ARCHITECTURE}
+arch=${LB_ARCHITECTURES}
 i386/linux=install/vmlinuz
 i386/initrd=install/initrd.gz
 i386/gtk/linux=install/vmlinuz
diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot
index 1e7fa9522..49d5b0d48 100755
--- a/scripts/build/lb_binary_yaboot
+++ b/scripts/build/lb_binary_yaboot
@@ -47,8 +47,8 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Check architecture
-Check_architecture powerpc ppc64
-Check_crossarchitecture
+Check_architectures powerpc ppc64
+Check_crossarchitectures
 
 # Checking depends
 Check_package chroot/usr/lib/yaboot/yaboot yaboot
@@ -156,7 +156,7 @@ case "${LB_BINARY_IMAGES}" in
 	;;
 esac
 
-Check_multiarchitecture
+Check_multiarchitectures
 
 # Creating directory
 mkdir -p "${DESTDIR_LIVE}"
diff --git a/scripts/build/lb_bootstrap_cache b/scripts/build/lb_bootstrap_cache
index 96cac1762..755baad01 100755
--- a/scripts/build/lb_bootstrap_cache
+++ b/scripts/build/lb_bootstrap_cache
@@ -25,7 +25,7 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi
 Set_defaults
 
 # Check architecture
-Check_crossarchitecture
+Check_crossarchitectures
 
 Echo_message "Begin caching bootstrap stage..."
 
diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
index 4a46818fa..2f648a3c0 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/scripts/build/lb_bootstrap_cdebootstrap
@@ -30,7 +30,7 @@ then
 fi
 
 # Check architecture
-Check_crossarchitecture
+Check_crossarchitectures
 
 Echo_message "Begin bootstrapping system..."
 
@@ -53,9 +53,9 @@ Create_lockfile .lock
 mkdir -p chroot
 
 # Setting cdebootstrap options
-if [ -n "${LB_ARCHITECTURE}" ]
+if [ -n "${LB_ARCHITECTURES}" ]
 then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURE}"
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}"
 fi
 
 if [ -n "${LB_BOOTSTRAP_CONFIG}" ]
diff --git a/scripts/build/lb_bootstrap_copy b/scripts/build/lb_bootstrap_copy
index 35d1378f0..45c96a7be 100755
--- a/scripts/build/lb_bootstrap_copy
+++ b/scripts/build/lb_bootstrap_copy
@@ -30,7 +30,7 @@ then
 fi
 
 # Check architecture
-Check_crossarchitecture
+Check_crossarchitectures
 
 Echo_message "Begin bootstrapping system..."
 
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index c25a7695d..7f3b9c7d6 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -30,7 +30,7 @@ then
 fi
 
 # Check architecture
-Check_crossarchitecture
+Check_crossarchitectures
 
 Echo_message "Begin bootstrapping system..."
 
@@ -53,9 +53,9 @@ Create_lockfile .lock
 mkdir -p chroot
 
 # Setting debootstrap options
-if [ -n "${LB_ARCHITECTURE}" ]
+if [ -n "${LB_ARCHITECTURES}" ]
 then
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURE}"
+	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}"
 fi
 
 if [ "${LB_ARCHIVE_AREAS}" != "main" ]
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index 8d6dc764d..7e163d954 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -198,15 +198,15 @@ EOF
 			fi
 
 			# Copy packages
-			if Find_files config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb
+			if Find_files config/chroot_local-packages/*_"${LB_ARCHITECTURES}".deb
 			then
-				for FILE in config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb
+				for FILE in config/chroot_local-packages/*_"${LB_ARCHITECTURES}".deb
 				do
 					if [ -L "${FILE}" ]
 					then
-						cp -L config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb chroot/root/local-packages
+						cp -L config/chroot_local-packages/*_"${LB_ARCHITECTURES}".deb chroot/root/local-packages
 					else
-						cp ${CP_OPTIONS} config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb chroot/root/local-packages
+						cp ${CP_OPTIONS} config/chroot_local-packages/*_"${LB_ARCHITECTURES}".deb chroot/root/local-packages
 					fi
 				done
 			fi
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 1b101d30f..e90841547 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -38,7 +38,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--apt-pipeline FIXME]\n\
 \t    [--apt-recommends true|false]\n\
 \t    [--apt-secure true|false]\n\
-\t    [-a|--architecture ARCHITECTURE]\n\
+\t    [-a|--architectures ARCHITECTURE]\n\
 \t    [-b|--binary-images iso|net|tar|usb-hdd]\n\
 \t    [--binary-filesystem fat16|fat32]\n\
 \t    [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
@@ -140,7 +140,7 @@ Local_arguments ()
 		apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,
 		cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
 		initramfs:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:,
-		templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
+		templates:,architectures:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
 		distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:,
 		mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
 		gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
@@ -355,8 +355,8 @@ Local_arguments ()
 				;;
 
 			# config/bootstrap
-			-a|--architecture)
-				LB_ARCHITECTURE="${2}"
+			-a|--architectures)
+				LB_ARCHITECTURES="${2}"
 				shift 2
 				;;
 
@@ -950,9 +950,9 @@ EOF
 cat > config/bootstrap << EOF
 # config/bootstrap - options for live-build(7), bootstrap stage
 
-# \$LB_ARCHITECTURE: select chroot architecture
+# \$LB_ARCHITECTURES: select chroot architectures
 # (Default: autodetected)
-LB_ARCHITECTURE="${LB_ARCHITECTURE}"
+LB_ARCHITECTURES="${LB_ARCHITECTURES}"
 
 # \$LB_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
diff --git a/scripts/build/lb_source_debian b/scripts/build/lb_source_debian
index ec1449784..f2d7dfe9d 100755
--- a/scripts/build/lb_source_debian
+++ b/scripts/build/lb_source_debian
@@ -64,7 +64,7 @@ genext2fs
 mtd-tools
 EOF
 
-case "${LB_ARCHITECTURE}" in
+case "${LB_ARCHITECTURES}" in
 	amd64|i386)
 
 cat >> source-selection.txt << EOF