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

Daniel Baumann daniel at debian.org
Wed Jun 29 04:20:57 UTC 2011


The following commit has been merged in the debian branch:
commit 21dfadb6225968fb960510f6fc04904f93b204b1
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jun 13 21:05:05 2011 +0200

    Using -wildcards option when calling mksquashfs with an excludes file.

diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 70a6dc7..754a7c2 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -357,7 +357,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				then
 					cp config/binary_rootfs/excludes chroot/excludes
 
-					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -ef /excludes"
+					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef /excludes"
 				fi
 
 				# Create image
@@ -425,7 +425,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 			false)
 				if [ -e config/binary_rootfs/excludes ]
 				then
-					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -ef config/binary_rootfs/excludes"
+					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef config/binary_rootfs/excludes"
 				fi
 
 				mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}

-- 
live-build



More information about the debian-live-changes mailing list