[SCM] live-build branch, debian, updated. debian/3.0_a21-1-22-gd7b042a

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 9d905734e5c3950ab74d29c08d10ca58472e114d
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jun 15 21:37:10 2011 +0200

    Unifying config/chroot_local-packagelists and config/binary_local-packagelists.
    
    Rather than using config/chroot_local-packagelists/*.list and
    config/binary_local-packagelists/*.list, we're simply using
    config/package-lists/*.chroot.list and
    config/package-lists/*.binary.list.

diff --git a/scripts/build/lb_binary_local-packagelists b/scripts/build/lb_binary_local-packagelists
index d2b2037..b0d28ab 100755
--- a/scripts/build/lb_binary_local-packagelists
+++ b/scripts/build/lb_binary_local-packagelists
@@ -38,7 +38,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if Find_files config/binary_local-packagelists/*.list
+if Find_files config/package-lists/*.binary.list
 then
 	# Restoring cache
 	Restore_cache cache/packages_chroot
@@ -53,10 +53,10 @@ then
 	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
 	touch chroot/var/lib/dpkg/status
 
-	for PACKAGELIST in config/binary_local-packagelists/*.list
+	for PACKAGELIST in config/package-lists/*.binary.list
 	do
 		# Generate package list
-		Expand_packagelist "${PACKAGELIST}" "config/binary_local-packagelists" "config/chroot_local-packagelists" > chroot/root/"$(basename ${PACKAGELIST})"
+		Expand_packagelist "${PACKAGELIST}" "config/package-lists" > chroot/root/"$(basename ${PACKAGELIST})"
 
 		# Downloading additional packages
 		Chroot chroot "xargs --arg-file=/root/$(basename ${PACKAGELIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
diff --git a/scripts/build/lb_chroot_local-packagelists b/scripts/build/lb_chroot_local-packagelists
index 20566e9..a2160be 100755
--- a/scripts/build/lb_chroot_local-packagelists
+++ b/scripts/build/lb_chroot_local-packagelists
@@ -41,15 +41,15 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if ls config/chroot_local-packagelists/*.list > /dev/null 2>&1 || \
-   ls config/chroot_local-packagelists/*.list.${_PASS} > /dev/null 2>&1
+if ls config/package-lists/*.chroot.list > /dev/null 2>&1 || \
+   ls config/package-lists/*.chroot_${_PASS}.list > /dev/null 2>&1
 then
-	for LIST in config/chroot_local-packagelists/*.list config/chroot_local-packagelists/*.list.${_PASS}
+	for LIST in config/package-lists/*.chroot.list config/package-lists/*.chroot_${_PASS}.list
 	do
 		if [ -e "${LIST}" ]
 		then
 			# Generating local package list
-			Expand_packagelist "$(basename ${LIST})" "config/chroot_local-packagelists" \
+			Expand_packagelist "$(basename ${LIST})" "config/package-lists" \
 				>> chroot/root/chroot_packages
 		fi
 	done
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 076fe01..90a5004 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -196,7 +196,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/binary_local-packagelists config/chroot_local-packagelists config/chroot_local-tasklists config/chroot_apt config/chroot_local-patches config/chroot_local-preseed config/binary_rootfs
+				for DIRECTORY in config/package-lists config/chroot_local-tasklists config/chroot_apt config/chroot_local-patches config/chroot_local-preseed config/binary_rootfs
 				do
 					if Find_files "${DIRECTORY}"
 					then
@@ -1154,7 +1154,7 @@ mkdir -p config/chroot_local-hooks
 mkdir -p config/chroot_local-includes
 mkdir -p config/chroot_local-patches
 mkdir -p config/chroot_local-packages
-mkdir -p config/chroot_local-packagelists
+mkdir -p config/package-lists
 mkdir -p config/chroot_local-preseed
 mkdir -p config/chroot_local-tasklists
 
@@ -1225,7 +1225,7 @@ mkdir -p config/binary_grub
 mkdir -p config/binary_local-debs
 mkdir -p config/binary_local-hooks
 mkdir -p config/binary_local-includes
-mkdir -p config/binary_local-packagelists
+mkdir -p config/package-lists
 mkdir -p config/binary_local-udebs
 mkdir -p config/binary_rootfs
 mkdir -p config/binary_syslinux
@@ -1394,7 +1394,7 @@ mkdir -p auto/scripts
 if [ "${CONFIG}" = "clone" ] # FIXME
 then
 	# Read package selection
-	echo $(dpkg --get-selections | awk '{ print $1 }') > config/chroot_local-packagelists/local-system
+	echo $(dpkg --get-selections | awk '{ print $1 }') > config/package-lists/local-system.chroot.list
 	LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS} local-system"
 
 	# Read debconf questions

-- 
live-build