[SCM] live-build branch, debian-next, updated. debian/3.0_a17-1-3-g101436b

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 101436b49c0a6d1df81af155000c157a2d84f92c
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jun 3 00:21:07 2011 +0200

    Restoring excludes functionality for mksquashfs. This was present some time ago but then got removed.

diff --git a/scripts/build/lb_binary_chroot b/scripts/build/lb_binary_chroot
index 3ce9708..aba7cff 100755
--- a/scripts/build/lb_binary_chroot
+++ b/scripts/build/lb_binary_chroot
@@ -97,7 +97,7 @@ fi
 ${LB_ROOT_COMMAND} mv chroot.tmp chroot/chroot
 
 # Handling chroot excludes
-if [ -f config/binary_rootfs/excludes ]
+if [ -f config/binary_rootfs/excludes ] && [ "${LB_BINARY_FILESYSTEM}" != "squashfs" ]
 then
 	case "${LB_BUILD_WITH_CHROOT}" in
 		true)
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 2e3e34e..212ba81 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -323,9 +323,18 @@ case "${LB_CHROOT_FILESYSTEM}" in
 
 		case "${LB_BUILD_WITH_CHROOT}" in
 			true)
+				if [ -e config/binary_rootfs/excludes ]
+				then
+					cp config/binary_rootfs/excludes chroot/chroot/excludes
+
+					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -ef /excludes"
+				fi
+
 				# Create image
 				Chroot chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
 
+				rm -f chroot/chroot/excludes
+
 				case "${LB_MODE}" in
 					ubuntu)
 						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
@@ -384,6 +393,11 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				;;
 
 			false)
+				if [ -e config/binary_rootfs/excludes ]
+				then
+					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -ef config/binary_rootfs/excludes"
+				fi
+
 				mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
 
 				case "${LB_MODE}" in

-- 
live-build