From edc9f07fe5eb49dbf4ee0166c726d2ad0d0e8ef8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Thu, 24 Jun 2010 01:43:38 +0200
Subject: Making excludes handling simpler, and dropping excluding of kernel
 images for minimal or stripped images (Closes: #586367).

---
 helpers/binary_chroot | 41 ++++++++++++++---------------------------
 helpers/binary_rootfs |  5 -----
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/helpers/binary_chroot b/helpers/binary_chroot
index 08c6f48..16c4ba3 100755
--- a/helpers/binary_chroot
+++ b/helpers/binary_chroot
@@ -96,34 +96,21 @@ fi
 ${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
 
 # Handling chroot excludes
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+if [ -f config/binary_rootfs/excludes ]
 then
-	if [ -f config/binary_rootfs/excludes ]
-	then
-		cp config/binary_rootfs/excludes chroot/chroot/excludes
-		chroot chroot/chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
-		rm -f chroot/chroot/excludes
-	fi
-
-	if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
-	then
-		case "${LH_PACKAGES_LISTS}" in
-			stripped|minimal)
-				# kernel images
-				rm -f chroot/chroot/boot/${LINUX}*
-				rm -f chroot/chroot/boot/initrd.img*
-
-				# kernel symlinks
-				rm -f chroot/chroot/${LINUX}*
-				rm -f chroot/chroot/initrd.img*
-				;;
-		esac
-	fi
-else
-	if [ "${LH_CHROOT_FILESYSTEM}" != "squashfs" ]
-	then
-		Echo_warning "rootfs excludes are not supported on non-chrooted builds unless squashfs as chroot filesystem is used, thus ignoring excludes now."
-	fi
+	case "${LH_BUILD_WITH_CHROOT}" in
+		true)
+			cp config/binary_rootfs/excludes chroot/chroot/excludes
+			chroot chroot/chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
+			rm -f chroot/chroot/excludes
+			;;
+
+		false)
+			cp config/binary_rootfs/excludes chroot/excludes
+			chroot chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
+			rm -f chroot/excludes
+			;;
+	esac
 fi
 
 if [ -n "${LH_ROOT_COMMAND}" ]
diff --git a/helpers/binary_rootfs b/helpers/binary_rootfs
index 9ed1358..ac2b1e7 100755
--- a/helpers/binary_rootfs
+++ b/helpers/binary_rootfs
@@ -362,11 +362,6 @@ case "${LH_CHROOT_FILESYSTEM}" in
 				;;
 
 			false)
-				if [ -f config/binary_rootfs/excludes ]
-				then
-					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef config/binary_rootfs/excludes"
-				fi
-
 				mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
 				;;
 		esac
-- 
cgit v1.0