Unifying lb_chroot_packagelists and lb_chroot_local-packagelists.

3 files changed, 22 insertions, 63 deletions

diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index c01941817..3ccbbfe91 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -59,7 +59,6 @@ lb chroot_local-preseed ${*}
 for _PASS in install live
 do
 	lb chroot_packagelists ${_PASS} ${*}
-	lb chroot_local-packagelists ${_PASS} ${*}
 	lb chroot_install-packages ${_PASS} ${*}
 	lb chroot_task-lists ${_PASS} ${*}
 
diff --git a/scripts/build/lb_chroot_local-packagelists b/scripts/build/lb_chroot_local-packagelists
deleted file mode 100755
index fd5adcf2b..000000000
--- a/scripts/build/lb_chroot_local-packagelists
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
-##
-## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'queue install of local package lists into chroot')"
-HELP=""
-USAGE="${PROGRAM} {install|live} [--force]"
-
-_PASS="${1}"
-shift
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin queueing installation of local package lists (${_PASS} pass)..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-packagelists.${PASS}
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/package-lists/*.list > /dev/null 2>&1 || \
-   ls config/package-lists/*.list.chroot > /dev/null 2>&1 || \
-   ls config/package-lists/*.list.chroot_${_PASS} > /dev/null 2>&1
-then
-	for LIST in config/package-lists/*.list \
-		    config/package-lists/*.list.chroot \
-		    config/package-lists/*.list.chroot_${_PASS}
-	do
-		if [ -e "${LIST}" ]
-		then
-			# Generating local package list
-			Expand_packagelist "$(basename ${LIST})" "config/package-lists" \
-				>> chroot/root/chroot_packages
-		fi
-	done
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_local-packagelists.${_PASS}
-fi
diff --git a/scripts/build/lb_chroot_packagelists b/scripts/build/lb_chroot_packagelists
index 4525465f6..5982ed739 100755
--- a/scripts/build/lb_chroot_packagelists
+++ b/scripts/build/lb_chroot_packagelists
@@ -41,6 +41,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
+# Handling global package lists
 if [ -n "${LB_PACKAGE_LISTS}" ] && [ "${LB_PACKAGE_LISTS}" != "none" ]
 then
 	for LIST in ${LB_PACKAGE_LISTS}
@@ -52,3 +53,24 @@ then
 	# Creating stage file
 	Create_stagefile .stage/chroot_packagelists.${_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 || \
+   ls config/package-lists/*.list.chroot_${_PASS} > /dev/null 2>&1
+then
+	for LIST in config/package-lists/*.list \
+		    config/package-lists/*.list.chroot \
+		    config/package-lists/*.list.chroot_${_PASS}
+	do
+		if [ -e "${LIST}" ]
+		then
+			# Generating package list
+			Expand_packagelist "$(basename ${LIST})" "config/package-lists" \
+				>> chroot/root/chroot_packages
+		fi
+	done
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_packagelists.${_PASS}
+fi