Subject: Passing -wildcards to mksquashfs call when having excludes, thanks to Phillip Lougher <[email-masked]>.

From: Daniel Baumann <[email-masked]>
Date: Tue, 26 Aug 2008 23:50:57 +0200

---
 helpers/lh_binary_rootfs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index ed0c98c..387bf80 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -273,7 +273,20 @@ case "${LH_CHROOT_FILESYSTEM}" in
 			disabled)
 				if [ -f config/binary_rootfs/excludes ]
 				then
-					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -ef config/binary_rootfs/excludes"
+					case "${LH_DISTRIBUTION}" in
+						etch)
+							MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -ef config/binary_rootfs/excludes"
+
+							if grep '*' config/binary_rootfs/excludes > /dev/null
+							then
+								Echo_warning "etch squashfs does not support wildcard excludes in config/binary_rootfs/excludes and are ignored. Please build in chrooted mode or adjust your exclude file."
+							fi
+							;;
+
+						lenny|sid)
+							MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef config/binary_rootfs/excludes"
+							;;
+					esac
 				fi
 
 				mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
-- 
cgit v1.0