Dropping global package-lists entirely, only local package lists within the config tree are support.

6 files changed, 21 insertions, 86 deletions

diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index ffc996ee4..dd722bc0a 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -154,13 +154,10 @@ case "${LB_BOOTLOADER}" in
 		;;
 esac
 
-if In_list "stripped minimal" "${LB_PACKAGE_LISTS}"
-then
-	if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
-	then
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
-	fi
-fi
+#if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
+#then
+#	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
+#fi
 
 if [ "${LB_BOOTLOADER}" = "grub2" ]
 then
diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
index ba7ea8a23..585a9d448 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/scripts/build/lb_bootstrap_cdebootstrap
@@ -76,26 +76,9 @@ then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LB_BOOTSTRAP_KEYRING}"
 fi
 
-if [ -z "${LB_BOOTSTRAP_FLAVOUR}" ]
+if [ -n "${LB_BOOTSTRAP_FLAVOUR}" ]
 then
-	case "${LB_PACKAGE_LISTS}" in
-		stripped|minimal)
-			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
-			;;
-		*)
-			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
-			;;
-	esac
-else
-	case "${LB_BOOTSTRAP_FLAVOUR}" in
-		stripped|minimal)
-			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
-			;;
-
-		*)
-			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LB_BOOTSTRAP_FLAVOUR}"
-			;;
-	esac
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LB_BOOTSTRAP_FLAVOUR}"
 fi
 
 if [ "${_DEBUG}" = "true" ]
@@ -152,13 +135,6 @@ then
 		${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
 	fi
 
-	# Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
-	case "${LB_PACKAGE_LISTS}" in
-		stripped|minimal)
-			Chroot chroot "dpkg -P cdebootstrap-helper-diverts"
-			;;
-	esac
-
 	# Deconfiguring cdebootstrap configurations
 	rm -f chroot/etc/apt/sources.list
 	rm -f chroot/etc/hosts
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index c47354d41..de542ea29 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -77,29 +77,17 @@ then
 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_EXCLUDE} | sed 's|  *|,|g')"
 fi
 
-if [ "${LB_USE_FAKEROOT}" != "true" ]
-then
-	if [ -z "${LB_BOOTSTRAP_FLAVOUR}" ]
-	then
-		if In_list "stripped minimal" "${LB_PACKAGE_LISTS}"
+case "${LB_USE_FAKEROOT}" in
+	true)
+		DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=fakechroot"
+		;;
+	false)
+		if [ -n "${LB_BOOTSTRAP_FLAVOUR}" ]
 		then
-			DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
+			DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LB_BOOTSTRAP_FLAVOUR}"
 		fi
-	else
-		case "${LB_BOOTSTRAP_FLAVOUR}" in
-			stripped|minimal)
-				DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
-				;;
-			standard)
-				;;
-
-			*)
-				DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LB_BOOTSTRAP_FLAVOUR}"
-		esac
-	fi
-else
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=fakechroot"
-fi
+		;;
+esac
 
 if [ "${_VERBOSE}" = "true" ]
 then
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 220f8abe6..6cdc5409f 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -342,11 +342,10 @@ EOF
 				# If we bootstrapped a minimal chroot, we need
 				# to install apt-utils before we have have
 				# completed all the indices.
-				case "${LB_PACKAGE_LISTS}" in
-					stripped|minimal)
-						Apt chroot update
-						;;
-				esac
+				if [ "${LB_BOOTSTRAP_FLAVOUR}" != "standard" ]
+				then
+					Apt chroot update
+				fi
 
 				# Check depends
 				Check_package chroot/usr/bin/apt-ftparchive apt-utils
diff --git a/scripts/build/lb_chroot_package-lists b/scripts/build/lb_chroot_package-lists
index fbb3bc786..4e3aab01d 100755
--- a/scripts/build/lb_chroot_package-lists
+++ b/scripts/build/lb_chroot_package-lists
@@ -50,19 +50,6 @@ Restore_cache cache/packages.chroot
 # Installing depends
 Install_package
 
-# Handling global package lists
-if [ -n "${LB_PACKAGE_LISTS}" ] && [ "${LB_PACKAGE_LISTS}" != "none" ]
-then
-	for LIST in ${LB_PACKAGE_LISTS}
-	do
-		# Generating package list
-		Expand_packagelist "${LIST}" >> chroot/root/packages.chroot
-	done
-
-	# Creating stage file
-	Create_stagefile .build/chroot_package-lists.${_PASS}
-fi
-
 # Handling local package lists
 if ls config/package-lists/*.list > /dev/null 2>&1 || \
    ls config/package-lists/*.list.chroot > /dev/null 2>&1 || \
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index dbc7d8a71..9bc1f2a24 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -114,7 +114,6 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--net-cow-path PATH]\n\
 \t    [--net-cow-server IP|HOSTNAME]\n\
 \t    [--net-tarball true|false]\n\
-\t    [-p|--package-lists LIST|\"LISTS\"]\n\
 \t    [--quiet]\n\
 \t    [--root-command sudo]\n\
 \t    [--use-fakeroot true|false]\n\
@@ -154,7 +153,7 @@ Local_arguments ()
 		mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,
 		archives:,archive-areas:,parent-archive-areas:,chroot-filesystem:,exposed-root:,
 		gzip-options:,hooks:,interactive:,keyring-packages:,linux-flavours:,linux-packages:,
-		package-lists:,security:,volatile:,backports:,binary-filesystem:,binary-images:,
+		security:,volatile:,backports:,binary-filesystem:,binary-images:,
 		apt-indices:,bootappend-install:,bootappend-live:,bootappend-failsafe:,bootloader:,checksums:,compression:,config:,zsync:,build-with-chroot:,
 		debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
 		grub-splash:,isohybrid-options:,hdd-label:,hdd-size:,iso-application:,iso-preparer:,iso-publisher:,
@@ -192,7 +191,7 @@ Local_arguments ()
 				Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 
 				# Dump contents of directories that contain text files
-				for DIRECTORY in config/package-lists config/task-lists config/chroot_apt config/chroot_local-patches config/preseed config/binary_rootfs
+				for DIRECTORY in config/package-lists config/chroot_apt config/chroot_local-patches config/preseed config/binary_rootfs
 				do
 					if Find_files "${DIRECTORY}"
 					then
@@ -548,11 +547,6 @@ Local_arguments ()
 				shift 2
 				;;
 
-			-p|--package-lists)
-				LB_PACKAGE_LISTS="${2}"
-				shift 2
-				;;
-
 			--security)
 				LB_SECURITY="${2}"
 				shift 2
@@ -1225,7 +1219,6 @@ mkdir -p config/packages
 mkdir -p config/packages.chroot
 mkdir -p config/package-lists
 mkdir -p config/preseed
-mkdir -p config/task-lists
 
 cat > config/chroot << EOF
 # config/chroot - options for live-build(7), chroot stage
@@ -1262,10 +1255,6 @@ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS}"
 # (Default: autodetected)
 LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES}"
 
-# \$LB_PACKAGE_LISTS: set package list to install
-# (Default: ${LB_PACKAGE_LISTS})
-LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS}"
-
 # \$LB_SECURITY: enable security updates
 # (Default: ${LB_SECURITY})
 LB_SECURITY="${LB_SECURITY}"
@@ -1471,7 +1460,6 @@ if [ "${CONFIG}" = "clone" ] # FIXME
 then
 	# Read package selection
 	echo $(dpkg --get-selections | awk '{ print $1 }') > config/package-lists/local.list.chroot
-	LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS} local-system"
 
 	# Read debconf questions
 	if [ ! -f /usr/bin/debconf-get-selections ]