From 2046ad7fdd0aebc26ff3ffb625c4446e83b76b68 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 30 Sep 2012 09:33:06 +0200
Subject: Don't turn on xz compression in mksquashfs for ubuntu builds
 according to Adam Conrad <adconrad@ubuntu.com>.

---
 scripts/build/binary_rootfs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index 6704b524a..41c284ac2 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -357,16 +357,11 @@ case "${LB_CHROOT_FILESYSTEM}" in
 			esac
 		fi
 
-		case "${LB_PARENT_DISTRIBUTION}" in
-			squeeze)
-
-				;;
-
-			*)
-				# FIXME: artax-backports too, once d-i has catched up
-				MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
-				;;
-		esac
+		if [ "${LB_PARENT_DISTRIBUTION}" != "squeeze" ] && \
+		   [ "${LB_MODE}" != "ubuntu" ]
+		then
+			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
+		fi
 
 		case "${LB_BUILD_WITH_CHROOT}" in
 			true)
-- 
cgit v1.2.3