Dropping global archive definitions shipped in /usr/share/live/build/archives (same as with packagelists, hidden archive 'magic' is gone now in favour of explicit config tree configuration).

2 files changed, 1 insertions, 142 deletions

diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index 0277819f5..6947c9dd5 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -189,78 +189,6 @@ EOF
 			fi
 		fi
 
-		# Configure third-party archives
-		if [ -n "${LB_ARCHIVES}" ]
-		then
-			for REPOSITORY in ${LB_ARCHIVES}
-			do
-				# ubuntu workaround to allow using live-systems.org
-				case "${LB_MODE}" in
-					ubuntu)
-						if [ "${REPOSITORY}" = "live-systems.org" ]
-						then
-							_DISTRIBUTION="sid"
-						else
-							_DISTRIBUTION="${LB_PARENT_DISTRIBUTION}"
-						fi
-						;;
-
-					*)
-						_DISTRIBUTION="${LB_PARENT_DISTRIBUTION}"
-						;;
-				esac
-
-				# Prefer archives from the config tree
-				# over the global ones.
-				if ! ls "${_BASE}/archives/${REPOSITORY}"* > /dev/null 2>&1
-				then
-					continue
-				fi
-
-				# Adding apt sources (chroot)
-				for _FILE in "${_BASE}/archives/${REPOSITORY}" "${_BASE}/archives/${REPOSITORY}.chroot"
-				do
-					if [ -e "${_FILE}" ]
-					then
-						sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \
-						    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-						    -e "s|@ARCHIVE_AREAS@|${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}|g" \
-						"${_FILE}" > "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
-					fi
-				done
-
-				# Adding apt configuration (chroot)
-				for _FILE in "${_BASE}/archives/${REPOSITORY}.conf" "${_BASE}/archives/${REPOSITORY}.conf.chroot"
-				do
-					if [ -e "${_FILE}" ]
-					then
-						cp "${_FILE}" "chroot/etc/apt/conf.d/${REPOSITORY}.conf"
-					fi
-				done
-
-				# Adding apt preferences (chroot)
-				for _FILE in "${_BASE}/archives/${REPOSITORY}.pref" "${_BASE}/archives/${REPOSITORY}.pref.chroot"
-				do
-					if [ -e "${_FILE}" ]
-					then
-						cp "${_FILE}" "chroot/etc/apt/preferences.d/${REPOSITORY}.pref"
-					fi
-				done
-
-				# Adding apt keys (chroot)
-				if [ "${LB_APT_SECURE}" != false ]
-				then
-					for _FILE in "${_BASE}/archives/${REPOSITORY}.key" "${_BASE}/archives/${REPOSITORY}.key.chroot"
-					do
-						if [ -e "${_FILE}" ]
-						then
-							cat "${_FILE}" | Chroot chroot "apt-key add -"
-						fi
-					done
-				fi
-			done
-		fi
-
 		# Adding local apt sources (chroot)
 		for FILE in config/archives/*.list config/archives/*.list.chroot
 		do
@@ -757,65 +685,6 @@ EOF
 		rm -f chroot/etc/apt/conf.d/*
 		rm -f chroot/etc/apt/preferences.d/*
 
-		# Configure third-party archives
-		if [ -n "${LB_ARCHIVES}" ]
-		then
-			for REPOSITORY in ${LB_ARCHIVES}
-			do
-				# Removing sources.list entries (chroot)
-				rm -f "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
-
-				# Prefer archives from the config tree
-				# over the global ones.
-				if ! ls "${_BASE}/archives/${REPOSITORY}"* > /dev/null 2>&1
-				then
-					continue
-				fi
-
-				# Adding apt sources (binary)
-				for _FILE in "${_BASE}/archives/${REPOSITORY}" "${_BASE}/archives/${REPOSITORY}.binary"
-				do
-					if [ -e "${_FILE}" ]
-					then
-						sed -e "s|@DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-						    -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-						    -e "s|@ARCHIVE_AREAS@|${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}|g" \
-						"${_FILE}" > "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
-					fi
-				done
-
-				# Adding apt configuration (binary)
-				for _FILE in "${_BASE}/archives/${REPOSITORY}.conf" "${_BASE}/archives/${REPOSITORY}.conf.binary"
-				do
-					if [ -e "${_FILE}" ]
-					then
-						cp "${_FILE}" "chroot/etc/apt/conf.d/${REPOSITORY}.conf"
-					fi
-				done
-
-				# Adding apt preferences (binary)
-				for _FILE in "${_BASE}/archives/${REPOSITORY}.pref" "${_BASE}/archives/${REPOSITORY}.pref.binary"
-				do
-					if [ -e "${_FILE}" ]
-					then
-						cp "${_FILE}" "chroot/etc/apt/preferences.d/${REPOSITORY}.pref"
-					fi
-				done
-
-				# Adding apt keys (binary)
-				if [ "${LB_APT_SECURE}" != false ]
-				then
-					for _FILE in "${_BASE}/archives/${REPOSITORY}.key" "${_BASE}/archives/${REPOSITORY}.key.binary"
-					do
-						if [ -e "${_FILE}" ]
-						then
-							cat "${_FILE}" | Chroot chroot "apt-key add -"
-						fi
-					done
-				fi
-			done
-		fi
-
 		# Adding local apt sources (binary)
 		for FILE in config/archives/*.list config/archives/*.list.binary
 		do
diff --git a/scripts/build/config b/scripts/build/config
index 3e8a646eb..19a95930a 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -105,7 +105,6 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--net-cow-server IP|HOSTNAME]\n\
 \t    [--net-tarball true|false]\n\
 \t    [--quiet]\n\
-\t    [--archives ARCHIVE|\"ARCHIVES\"]\n\
 \t    [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
 \t    [--parent-archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
 \t    [--security true|false]\n\
@@ -139,7 +138,7 @@ Local_arguments ()
 		parent-mirror-binary-security:,parent-mirror-debian-installer:,
 		mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:,
 		mirror-binary-security:,mirror-debian-installer:,
-		archives:,archive-areas:,parent-archive-areas:,chroot-filesystem:,exposed-root:,
+		archive-areas:,parent-archive-areas:,chroot-filesystem:,exposed-root:,
 		gzip-options:,hooks:,image-name:,interactive:,keyring-packages:,linux-flavours:,linux-packages:,
 		security:,updates:,backports:,binary-filesystem:,binary-images:,
 		apt-indices:,bootappend-install:,bootappend-live:,bootappend-live-failsafe:,bootloader:,checksums:,compression:,config:,zsync:,build-with-chroot:,
@@ -424,11 +423,6 @@ Local_arguments ()
 				shift 2
 				;;
 
-			--archives)
-				LB_ARCHIVES="${2}"
-				shift 2
-				;;
-
 			--archive-areas)
 				LIVE_IMAGE_ARCHIVE_AREAS="${2}"
 				shift 2
@@ -1105,10 +1099,6 @@ LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY}"
 # (Default: ${LB_MIRROR_BOOTSTRAP})
 LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}"
 
-# \$LB_ARCHIVES: enable available third-party archives
-# (Default: empty)
-LB_ARCHIVES="${LB_ARCHIVES}"
-
 # \$LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap
 # (Default: ${LB_BOOTSTRAP_QEMU_ARCHITECTURES})
 LB_BOOTSTRAP_QEMU_ARCHITECTURES="${LB_BOOTSTRAP_QEMU_ARCHITECTURES}"