From 9d905734e5c3950ab74d29c08d10ca58472e114d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Wed, 15 Jun 2011 21:37:10 +0200
Subject: 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.
---
 scripts/build/lb_config | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts/build/lb_config')

diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 076fe0145..90a5004b7 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
-- 
cgit v1.2.3