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

2 files changed, 1 insertions, 21 deletions

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 8788aeb3b..f29f1a8cb 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -870,9 +870,6 @@ Set_defaults ()
 			;;
 	esac
 
-	# Setting package list
-	LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS:-standard}"
-
 	# Setting security updates option
 	case "${LB_PARENT_DISTRIBUTION}" in
 		jessie|sid)
@@ -1276,15 +1273,6 @@ Check_defaults ()
 		fi
 	fi
 
-	if echo ${LB_PACKAGE_LISTS} | grep -qs -E "(stripped|minimal)\b"
-	then
-		# aptitude + stripped|minimal
-		if [ "${LB_APT}" = "aptitude" ]
-		then
-			Echo_warning "You selected LB_PACKAGE_LISTS='%s' and LB_APT='aptitude'" "${LB_PACKAGE_LIST}. This configuration is potentially unsafe, as aptitude is not used in the stripped/minimal package lists."
-		fi
-	fi
-
 	if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
 	then
 		# d-i true, no caching
@@ -1338,14 +1326,6 @@ Check_defaults ()
 		Echo_warning "You have specified a value of LB_ISO_VOLUME that is too long; the maximum length is 32 characters."
 	fi
 
-	if echo ${LB_PACKAGE_LISTS} | grep -qs -E "(stripped|minimal)\b"
-	then
-		if [ "${LB_APT_INDICES}" = "true" ]
-		then
-			Echo_warning "You have selected hook to minimise image size but you are still including package indices with your value of LB_APT_INDICES."
-		fi
-	fi
-
 	# Architectures to use foreign bootstrap for
 	LB_BOOTSTRAP_QEMU_ARCHITECTURES="${LB_BOOTSTRAP_QEMU_ARCHITECTURES:-}"
 
diff --git a/functions/packagelists.sh b/functions/packagelists.sh
index eda9cf542..c126d25db 100755
--- a/functions/packagelists.sh
+++ b/functions/packagelists.sh
@@ -22,7 +22,7 @@ Expand_packagelist ()
 		_LB_NESTED=0
 		_LB_ENABLED=1
 
-		for _LB_SEARCH_PATH in ${@} "${LIVE_BUILD}/package-lists" /usr/share/live/build/package-lists
+		for _LB_SEARCH_PATH in ${@}
 		do
 			if [ -e "${_LB_SEARCH_PATH}/${_LB_LIST_NAME}" ]
 			then