[SCM] live-build branch, debian, updated. debian/3.0_a30-1-31-g468a41f

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit fa0ba13de67fdba694cf733a7c50529a79cc851c
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 7 15:08:14 2011 +0200

    Renaming binary.packages list files (that contain what package is installed in the chroot) to chroot as they are build during chroot stage, this fixes some rebuild issues.

diff --git a/scripts/build/lb_binary_manifest b/scripts/build/lb_binary_manifest
index e80d780..373e005 100755
--- a/scripts/build/lb_binary_manifest
+++ b/scripts/build/lb_binary_manifest
@@ -61,8 +61,8 @@ case "${LB_INITRAMFS}" in
 esac
 
 # Add filesystem.packages
-cp binary.packages.live "binary/${INITFS}/filesystem.${SUFFIX}"
-echo "$(diff binary.packages.live binary.packages.install | awk '/^< / { print $2 }')" \
+cp chroot.packages.live "binary/${INITFS}/filesystem.${SUFFIX}"
+echo "$(diff chroot.packages.live chroot.packages.install | awk '/^< / { print $2 }')" \
 	> "binary/${INITFS}/filesystem.${SUFFIX}-remove"
 
 # Creating stage file
diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index 7aacdfd..e459c6c 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -64,7 +64,7 @@ do
 
 	if [ "${_PASS}" = install ]
 	then
-		Chroot chroot "dpkg-query -W" > binary.packages.install
+		Chroot chroot "dpkg-query -W" > chroot.packages.install
 	fi
 done
 
@@ -75,7 +75,7 @@ lb chroot_hooks ${*}
 lb chroot_hacks ${*}
 lb chroot_interactive ${*}
 
-Chroot chroot "dpkg-query -W" > binary.packages.live
+Chroot chroot "dpkg-query -W" > chroot.packages.live
 
 # Deconfiguring chroot
 lb chroot_archives chroot remove ${*}
diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean
index 666ffc9..d486442 100755
--- a/scripts/build/lb_clean
+++ b/scripts/build/lb_clean
@@ -86,6 +86,8 @@ do
 
 			${LB_ROOT_COMMAND} rm -rf chroot chroot.tmp
 
+			rm -f chroot.packages.live chroot.packages.install
+
 			rm -f .stage/chroot*
 			;;
 
@@ -96,7 +98,7 @@ do
 			rm -f binary*.img
 			rm -f binary*.tar.gz
 			rm -f binary.sh
-			rm -f binary.list binary.packages binary.packages.install binary.packages.live md5sum.txt
+			rm -f binary.list md5sum.txt
 
 			rm -rf binary
 			rm -rf tftpboot

-- 
live-build