Moving off binary image architecture into new config tree format.

17 files changed, 75 insertions, 78 deletions

diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index e0f3a3723..93ae4fa05 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -76,7 +76,7 @@ Install_package
 # Setting destination directory
 case "${LIVE_IMAGE_TYPE}" in
 	netboot)
-		DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURES}"
+		DESTDIR="tftpboot/debian-install/${LIVE_IMAGE_ARCHITECTURE}"
 		;;
 
 	hdd*|tar)
@@ -107,7 +107,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 esac
 
 # Set architecture-specific variables
-case "${LB_ARCHITECTURES}" in
+case "${LIVE_IMAGE_ARCHITECTURE}" in
 	armel)
 		DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
 		case "${DI_IMAGE_TYPE}" in
@@ -127,11 +127,11 @@ case "${LB_ARCHITECTURES}" in
 	powerpc)
 		case "${DI_IMAGE_TYPE}" in
 			cdrom)
-				DI_REMOTE_BASE="${LB_ARCHITECTURES}/cdrom"
+				DI_REMOTE_BASE="${LIVE_IMAGE_ARCHITECTURE}/cdrom"
 			;;
 
 			netboot)
-				DI_REMOTE_BASE="${LB_ARCHITECTURES}/netboot"
+				DI_REMOTE_BASE="${LIVE_IMAGE_ARCHITECTURE}/netboot"
 				;;
 		esac
 
@@ -149,8 +149,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/${LIVE_IMAGE_ARCHITECTURE}"
+				DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LIVE_IMAGE_ARCHITECTURE}"
 				DI_REMOTE_KERNEL="linux"
 				;;
 
@@ -255,9 +255,9 @@ case "${LB_DERIVATIVE}" in
 			LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
 
 			# Debian Installer daily builds
-			URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
+			URL="http://d-i.debian.org/daily-images/${LIVE_IMAGE_ARCHITECTURE}/daily/"
 		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-${LIVE_IMAGE_ARCHITECTURE}/current/images/"
 		fi
 		;;
 
@@ -267,23 +267,23 @@ case "${LB_DERIVATIVE}" in
 			LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
 
 			# Debian Installer daily builds
-			URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
+			URL="http://d-i.debian.org/daily-images/${LIVE_IMAGE_ARCHITECTURE}/daily/"
 		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-${LIVE_IMAGE_ARCHITECTURE}/current/images/"
 		fi
 
 		if [ "${LB_MODE}" = "progress-linux" ]
 		then
 			# FIXME: normal derivatives probably don't rebuild d-i,
 			# but progress-linux does.
-			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-${LIVE_IMAGE_ARCHITECTURE}/current/images/"
 		fi
 		;;
 esac
 
 mkdir -p "${DESTDIR_DI}"
 
-if [ "${LB_ARCHITECTURES}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ]
+if [ "${LIVE_IMAGE_ARCHITECTURE}" = "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
@@ -306,7 +306,7 @@ else
 	DOWNLOAD_GTK_INSTALLER=0
 	if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ]
 	then
-		case "${LB_ARCHITECTURES}" in
+		case "${LIVE_IMAGE_ARCHITECTURE}" in
 			amd64|i386)
 				DOWNLOAD_GTK_INSTALLER=1
 				;;
@@ -337,7 +337,7 @@ then
 	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
 	touch chroot/var/lib/dpkg/status
 
-	case "${LB_ARCHITECTURES}" in
+	case "${LIVE_IMAGE_ARCHITECTURE}" in
 		amd64)
 			DI_REQ_PACKAGES="lilo grub grub-pc"
 
@@ -419,15 +419,15 @@ then
 
 		FIRMWARE_PACKAGES=""
 
-		_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
+		_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)"
 
-		rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
+		rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
 
 		for _CONTENT in ${_CONTENTS}
 		do
-			wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
+			wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
 
-			FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)"
+			FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
 		done
 
 		if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
@@ -441,15 +441,15 @@ then
 		then
 			# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents).
 
-			_CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
+			_CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)"
 
-			rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}
+			rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
 
 			for _CONTENT in ${_CONTENTS}
 			do
-				wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}
+				wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
 
-				FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)"
+				FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
 			done
 		fi
 
@@ -532,9 +532,9 @@ then
 	fi
 
 	# 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/*_"${LIVE_IMAGE_ARCHITECTURE}".deb || Find_files config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb
 	then
-		for FILE in config/packages.binary/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb
+		for FILE in config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".deb config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb
 		do
 			if [ -e "${FILE}" ]
 			then
@@ -557,18 +557,18 @@ then
 	# Generating deb indices
 	for _ARCHIVE_AREA in $(cd binary/pool && ls)
 	do
-		mkdir -p binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}
+		mkdir -p binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}
 
 		mv binary chroot/root
-		echo "cd /root/binary && apt-ftparchive packages pool/${_ARCHIVE_AREA} > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh
+		echo "cd /root/binary && apt-ftparchive packages pool/${_ARCHIVE_AREA} > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages" > chroot/binary.sh
 		Chroot chroot "sh binary.sh"
 		rm -f chroot/binary.sh
 		mv chroot/root/binary ./
 
-		gzip -9 -c binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages > binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages.gz
+		gzip -9 -c binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz
 
 		# Fetching release
-		Download_file binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Release "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/${_ARCHIVE_AREA}/binary-"${LB_ARCHITECTURES}"/Release
+		Download_file binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Release "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/${_ARCHIVE_AREA}/binary-"${LIVE_IMAGE_ARCHITECTURE}"/Release
 	done
 
 	# Symlink firmware packages to /firmware
@@ -593,12 +593,12 @@ then
 	cd binary.udeb
 
 	# 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-"${LIVE_IMAGE_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-"${LIVE_IMAGE_ARCHITECTURE}"/Packages.gz
 		gunzip -c Packages.derivative.gz > Packages.derivative
 	fi
 
@@ -639,9 +639,9 @@ then
 	cp *.udeb ../cache/packages.binary_debian-installer.udeb
 
 	# 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/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb || Find_files ../config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb
 	then
-		for FILE in ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb ../config/packages/*_"${LB_ARCHITECTURES}".udeb
+		for FILE in ../config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb ../config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb
 		do
 			if [ -e "${FILE}" ]
 			then
@@ -674,7 +674,7 @@ then
 		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-${LIVE_IMAGE_ARCHITECTURE}" >> exclude || true
 
 			continue
 		fi
@@ -710,17 +710,17 @@ then
 	done
 
 	# Creating udeb indices
-	mkdir -p dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"
+	mkdir -p dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_IMAGE_ARCHITECTURE}"
 	cd "${OLDPWD}"
 
 	mv binary.udeb chroot/root
-	echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh
+	echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LIVE_IMAGE_ARCHITECTURE}/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_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages.gz
+	gzip -9 -c dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz
 
 	rm -f Packages* exclude
 	find . | cpio -dmpu "${OLDPWD}"/binary
@@ -752,7 +752,7 @@ cd /root/binary && apt-ftparchive \
 	-o APT::FTPArchive::Release::Version="${_VERSION}" \
 	-o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \
 	-o APT::FTPArchive::Release::Date="$(date -R)" \
-	-o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \
+	-o APT::FTPArchive::Release::Architectures="${LIVE_IMAGE_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/binary_disk b/scripts/build/binary_disk
index ea9d605d3..8fd2b1e20 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -48,7 +48,7 @@ Create_lockfile .lock
 
 mkdir -p binary/.disk
 
-ARCHITECTURE="$(echo ${LB_ARCHITECTURES} | sed -e 's| |/|g')"
+ARCHITECTURE="$(echo ${LIVE_IMAGE_ARCHITECTURE} | 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}`"
@@ -133,7 +133,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 		do
 			if [ -e "${LOCATION}" ]
 			then
-				cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include
+				cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_udeb_include" binary/.disk/udeb_include
 
 				continue
 			fi
@@ -158,7 +158,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 		do
 			if [ -e "${LOCATION}" ]
 			then
-				cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include
+				cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_netinst_udeb_include" binary/.disk/udeb_include
 
 				continue
 			fi
@@ -181,7 +181,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 		do
 			if [ -e "${LOCATION}" ]
 			then
-				cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include
+				cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_businesscard_udeb_include" binary/.disk/udeb_include
 
 				continue
 			fi
diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd
index 4df21dc2f..d4b2775ca 100755
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@@ -57,7 +57,7 @@ esac
 Check_package chroot/usr/share/doc/mtools mtools
 Check_package chroot/sbin/parted parted
 
-if [ "${LB_ARCHITECTURES}" = "sparc" ]
+if [ "${LIVE_IMAGE_ARCHITECTURE}" = "sparc" ]
 then
 	case "${LB_BINARY_FILESYSTEM}" in
 		ext2|ext3|ext4)
@@ -136,7 +136,7 @@ fi
 echo "!!! The following error/warning messages can be ignored !!!"
 Losetup $FREELO chroot/binary.img 0
 
-case "${LB_ARCHITECTURES}" in
+case "${LIVE_IMAGE_ARCHITECTURE}" in
 	sparc)
 		PARTITION_TABLE_TYPE="sun"
 		;;
diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image
index f01ed8516..bfda74ef9 100755
--- a/scripts/build/binary_linux-image
+++ b/scripts/build/binary_linux-image
@@ -57,7 +57,7 @@ case "${LB_INITRAMFS}" in
 		;;
 esac
 
-case "${LB_ARCHITECTURES}" in
+case "${LIVE_IMAGE_ARCHITECTURE}" in
 	powerpc)
 		LINUX="vmlinux"
 		;;
diff --git a/scripts/build/binary_loadlin b/scripts/build/binary_loadlin
index 1e6a10e0c..77bae8dd0 100755
--- a/scripts/build/binary_loadlin
+++ b/scripts/build/binary_loadlin
@@ -43,7 +43,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-case "${LB_ARCHITECTURES}" in
+case "${LIVE_IMAGE_ARCHITECTURE}" in
 	amd64|i386)
 		if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
 		then
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index 826a12e60..5d21b2201 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -43,7 +43,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ "${LB_ARCHITECTURES}" != "amd64" ] && [ "${LB_ARCHITECTURES}" != "i386" ]
+if [ "${LIVE_IMAGE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_IMAGE_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 d6cf2e266..6b80bee27 100755
--- a/scripts/build/binary_netboot
+++ b/scripts/build/binary_netboot
@@ -48,7 +48,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ "${LB_ARCHITECTURES}" = "sparc" ]
+if [ "${LIVE_IMAGE_ARCHITECTURE}" = "sparc" ]
 then
 	# Checking depends
 	Check_package chroot/usr/bin/elftoaout sparc-utils
diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
index ce459ab3a..6f897b0c3 100755
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -139,9 +139,9 @@ then
 	do
 		SECTION="$(basename ${SECTION})"
 
-		mkdir -p dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}
-		apt-ftparchive packages pool/${SECTION} > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages
-		gzip -9 -c dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz
+		mkdir -p dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}
+		apt-ftparchive packages pool/${SECTION} > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages
+		gzip -9 -c dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz
 	done
 
 	cd "${OLDPWD}"
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index 1743ff169..e98ef005b 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -38,7 +38,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-case "${LB_ARCHITECTURES}" in
+case "${LIVE_IMAGE_ARCHITECTURE}" in
 	amd64|i386)
 		LINUX="vmlinuz"
 		;;
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 12f59e089..52a4774ce 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -299,7 +299,7 @@ then
 
 	eval _VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
 	_DISTRIBUTION="${LB_DISTRIBUTION}"
-	_ARCHITECTURE="${LB_ARCHITECTURES}"
+	_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE}"
 	_DATE=$(date -R)
 	_YEAR="$(date +%Y)"
 	_MONTH="$(date +%m)"
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index 4789398a1..2939bfe27 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -43,7 +43,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-case "${LB_ARCHITECTURES}" in
+case "${LIVE_IMAGE_ARCHITECTURE}" in
 	amd64|i386)
 		if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
 		then
@@ -80,7 +80,7 @@ case "${LB_ARCHITECTURES}" in
 
 cat > binary/win32-loader.ini << EOF
 [installer]
-arch=${LB_ARCHITECTURES}
+arch=${LIVE_IMAGE_ARCHITECTURE}
 i386/linux=install/vmlinuz
 i386/initrd=install/initrd.gz
 i386/gtk/linux=install/vmlinuz
diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap
index 1c778e379..045b3e864 100755
--- a/scripts/build/bootstrap_cdebootstrap
+++ b/scripts/build/bootstrap_cdebootstrap
@@ -61,9 +61,9 @@ Create_lockfile .lock
 mkdir -p chroot
 
 # Setting cdebootstrap options
-if [ -n "${LB_ARCHITECTURES}" ]
+if [ -n "${LIVE_IMAGE_ARCHITECTURE}" ]
 then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}"
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LIVE_IMAGE_ARCHITECTURE}"
 fi
 
 if [ "${_DEBUG}" = "true" ]
@@ -115,7 +115,7 @@ then
 	Echo_breakage "Running ${LB_BOOTSTRAP}... "
 
 	# Run appropriate bootstrap, i.e. foreign or regular bootstrap
-	if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LB_ARCHITECTURES}" ]; then
+	if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LIVE_IMAGE_ARCHITECTURE}" ]; then
 
 		if [ -n "${LB_BOOTSTRAP_QEMU_EXCLUDE}" ]
 		then
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
index 7be24378d..3f4a7afe4 100755
--- a/scripts/build/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@@ -61,9 +61,9 @@ Create_lockfile .lock
 mkdir -p chroot
 
 # Setting debootstrap options
-if [ -n "${LB_ARCHITECTURES}" ]
+if [ -n "${LIVE_IMAGE_ARCHITECTURE}" ]
 then
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}"
+	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LIVE_IMAGE_ARCHITECTURE}"
 fi
 
 if [ "${LB_ARCHIVE_AREAS}" != "main" ]
@@ -119,7 +119,7 @@ then
 	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}" = "${LIVE_IMAGE_ARCHITECTURE}" ]; then
 
 		if [ -n "${LB_BOOTSTRAP_QEMU_EXCLUDE}" ]
 		then
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index 99433cf4c..d8712eeec 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -311,9 +311,9 @@ EOF
 			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/*_"${LIVE_IMAGE_ARCHITECTURE}".deb || Find_files config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb
 			then
-				for FILE in config/packages.chroot/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb
+				for FILE in config/packages.chroot/*_"${LIVE_IMAGE_ARCHITECTURE}".deb config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb
 				do
 					if [ -L "${FILE}" ]
 					then
diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image
index 23c0633c6..74995f08e 100755
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -63,15 +63,15 @@ then
 
 		FIRMWARE_PACKAGES=""
 
-		_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
+		_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)"
 
-		rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
+		rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
 
 		for _CONTENT in ${_CONTENTS}
 		do
-			wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
+			wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
 
-			FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)"
+			FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
 		done
 
 		if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
@@ -85,15 +85,15 @@ then
 		then
 			# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents).
 
-			_CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
+			_CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)"
 
-			rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}
+			rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
 
 			for _CONTENT in ${_CONTENTS}
 			do
-				wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}
+				wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
 
-				FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)"
+				FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
 			done
 		fi
 
diff --git a/scripts/build/config b/scripts/build/config
index 17106e487..f97ae0ba3 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -370,7 +370,7 @@ Local_arguments ()
 
 			# config/bootstrap
 			-a|--architectures)
-				LB_ARCHITECTURES="${2}"
+				LIVE_IMAGE_ARCHITECTURE="${2}"
 				shift 2
 				;;
 
@@ -956,9 +956,9 @@ Check_defaults
 
 if [ ! -e config ]
 then
-	Echo_message "Creating config tree for a ${LB_MODE}/${LB_ARCHITECTURES} system"
+	Echo_message "Creating config tree for a ${LB_MODE}/${LIVE_IMAGE_ARCHITECTURE} system"
 else
-	Echo_message "Updating config tree for a ${LB_MODE}/${LB_ARCHITECTURES} system"
+	Echo_message "Updating config tree for a ${LB_MODE}/${LIVE_IMAGE_ARCHITECTURE} system"
 fi
 
 # Creating bootstrap configuration
@@ -1108,10 +1108,6 @@ EOF
 cat > config/bootstrap << EOF
 # config/bootstrap - options for live-build(7), bootstrap stage
 
-# \$LB_ARCHITECTURES: select chroot architectures
-# (Default: autodetected)
-LB_ARCHITECTURES="${LB_ARCHITECTURES}"
-
 # \$LB_DISTRIBUTION: select distribution to use
 # (Default: ${LB_DISTRIBUTION})
 LB_DISTRIBUTION="${LB_DISTRIBUTION}"
@@ -1490,6 +1486,7 @@ Set_configuration "config/control" "Configuration-Version" "${LIVE_CONFIGURATION
 echo "" >> config/control
 Set_configuration "config/control" "Image" "binary"
 Set_configuration "config/control" "Type" "${LIVE_IMAGE_TYPE}"
+Set_configuration "config/control" "Architecture" "${LIVE_IMAGE_ARCHITECTURE}"
 
 # Creating stage file
 Create_stagefile .build/config
diff --git a/scripts/build/source_debian b/scripts/build/source_debian
index fc85ff601..1fe2fb905 100755
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@@ -71,7 +71,7 @@ case "${LB_BINARY_FILESYSTEM}" in
 		;;
 esac
 
-case "${LB_ARCHITECTURES}" in
+case "${LIVE_IMAGE_ARCHITECTURE}" in
 	amd64|i386)
 
 cat >> source-selection.txt << EOF