[SCM] live-build branch, debian-next, updated. debian/3.0_a30-1-21-g0a32c8b

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit e82aa251347d0f6a55ed2c74e670631914249556
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 7 15:59:48 2011 +0200

    Renaming config/chroot_packages to config/packages.chroot.

diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt
index ab926aa..2e00004 100755
--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -108,7 +108,7 @@ case "${1}" in
 			cp config/chroot_apt/preferences chroot/etc/apt/preferences
 		fi
 
-		if Find_files config/chroot_packages/*.deb
+		if Find_files config/packages.chroot/*.deb
 		then
 			echo >> chroot/etc/apt/preferences
 			echo "# Added by lb_chroot_apt ${@}" >> chroot/etc/apt/preferences
@@ -236,7 +236,7 @@ EOF
 			fi
 		fi
 
-		if Find_files config/chroot_packages/*.deb
+		if Find_files config/packages.chroot/*.deb
 		then
 			if [ -f chroot/etc/apt/preferences ]
 			then
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 2b185cd..ab767ab 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -277,39 +277,39 @@ EOF
 		fi
 
 		# Configure local package repository
-		if Find_files config/chroot_packages/*.deb
+		if Find_files config/packages.chroot/*.deb
 		then
 			rm -rf chroot/root/packages
 			mkdir -p chroot/root/packages
 
-			if [ "$(stat --printf %d config/chroot_packages)" = "$(stat --printf %d chroot/root/packages)" ]
+			if [ "$(stat --printf %d config/packages.chroot)" = "$(stat --printf %d chroot/root/packages)" ]
 			then
 				CP_OPTIONS="-l"
 			fi
 
 			# Copy packages
-			if Find_files config/chroot_packages/*_"${LB_ARCHITECTURES}".deb
+			if Find_files config/packages.chroot/*_"${LB_ARCHITECTURES}".deb
 			then
-				for FILE in config/chroot_packages/*_"${LB_ARCHITECTURES}".deb
+				for FILE in config/packages.chroot/*_"${LB_ARCHITECTURES}".deb
 				do
 					if [ -L "${FILE}" ]
 					then
-						cp -L config/chroot_packages/*_"${LB_ARCHITECTURES}".deb chroot/root/packages
+						cp -L config/packages.chroot/*_"${LB_ARCHITECTURES}".deb chroot/root/packages
 					else
-						cp ${CP_OPTIONS} config/chroot_packages/*_"${LB_ARCHITECTURES}".deb chroot/root/packages
+						cp ${CP_OPTIONS} config/packages.chroot/*_"${LB_ARCHITECTURES}".deb chroot/root/packages
 					fi
 				done
 			fi
 
-			if Find_files config/chroot_packages/*_all.deb
+			if Find_files config/packages.chroot/*_all.deb
 			then
-				for FILE in config/chroot_packages/*_all.deb
+				for FILE in config/packages.chroot/*_all.deb
 				do
 					if [ -L "${FILE}" ]
 					then
-						cp -L config/chroot_packages/*_all.deb chroot/root/packages
+						cp -L config/packages.chroot/*_all.deb chroot/root/packages
 					else
-						cp ${CP_OPTIONS} config/chroot_packages/*_all.deb chroot/root/packages
+						cp ${CP_OPTIONS} config/packages.chroot/*_all.deb chroot/root/packages
 					fi
 				done
 			fi
@@ -432,7 +432,7 @@ EOF
 		if Find_files chroot/root/packages/*.deb
 		then
 			gunzip < chroot/root/packages/Packages.gz | awk '/^Package: / { print $2 }' \
-			>> chroot/root/chroot_packages
+			>> chroot/root/packages.chroot
 		fi
 
 		# Update indices from cache
diff --git a/scripts/build/lb_chroot_install-packages b/scripts/build/lb_chroot_install-packages
index cd3c178..37d055a 100755
--- a/scripts/build/lb_chroot_install-packages
+++ b/scripts/build/lb_chroot_install-packages
@@ -42,7 +42,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ -e chroot/root/chroot_packages ] && [ -s chroot/root/chroot_packages ]
+if [ -e chroot/root/packages.chroot ] && [ -s chroot/root/packages.chroot ]
 then
 	# Restoring cache
 	Restore_cache cache/packages_chroot
@@ -50,16 +50,16 @@ then
 	# Installing packages
 	case "${LB_APT}" in
 		apt|apt-get)
-			Chroot chroot "xargs --arg-file=/root/chroot_packages apt-get ${APT_OPTIONS} install"
+			Chroot chroot "xargs --arg-file=/root/packages.chroot apt-get ${APT_OPTIONS} install"
 			;;
 
 		aptitude)
-			Chroot chroot "xargs --arg-file=/root/chroot_packages aptitude ${APTITUDE_OPTIONS} install"
+			Chroot chroot "xargs --arg-file=/root/packages.chroot aptitude ${APTITUDE_OPTIONS} install"
 			;;
 	esac
 
 	# Tidying up
-	rm -f chroot/root/chroot_packages
+	rm -f chroot/root/packages.chroot
 
 	# Saving cache
 	Save_cache cache/packages_chroot
diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image
index e060ff3..a655277 100755
--- a/scripts/build/lb_chroot_linux-image
+++ b/scripts/build/lb_chroot_linux-image
@@ -49,7 +49,7 @@ then
 	do
 		for PACKAGE in ${LB_LINUX_PACKAGES}
 		do
-			echo ${PACKAGE}-${FLAVOUR} >> chroot/root/chroot_packages
+			echo ${PACKAGE}-${FLAVOUR} >> chroot/root/packages.chroot
 		done
 	done
 
diff --git a/scripts/build/lb_chroot_packagelists b/scripts/build/lb_chroot_packagelists
index 5982ed7..615b4d7 100755
--- a/scripts/build/lb_chroot_packagelists
+++ b/scripts/build/lb_chroot_packagelists
@@ -47,7 +47,7 @@ then
 	for LIST in ${LB_PACKAGE_LISTS}
 	do
 		# Generating package list
-		Expand_packagelist "${LIST}" >> chroot/root/chroot_packages
+		Expand_packagelist "${LIST}" >> chroot/root/packages.chroot
 	done
 
 	# Creating stage file
@@ -67,7 +67,7 @@ then
 		then
 			# Generating package list
 			Expand_packagelist "$(basename ${LIST})" "config/package-lists" \
-				>> chroot/root/chroot_packages
+				>> chroot/root/packages.chroot
 		fi
 	done
 
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 7ac14c5..a1b2a0e 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1163,7 +1163,7 @@ mkdir -p config/chroot_apt
 mkdir -p config/hooks
 mkdir -p config/local.chroot
 mkdir -p config/chroot_local-patches
-mkdir -p config/chroot_packages
+mkdir -p config/packages.chroot
 mkdir -p config/package-lists
 mkdir -p config/chroot_local-preseed
 mkdir -p config/task-lists

-- 
live-build