[SCM] live-build branch, debian, updated. debian/3.0_a60-1-10-gf735d98
Daniel Baumann
daniel at debian.org
Sun Sep 30 07:47:33 UTC 2012
The following commit has been merged in the debian branch:
commit 2046ad7fdd0aebc26ff3ffb625c4446e83b76b68
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Sep 30 09:33:06 2012 +0200
Don't turn on xz compression in mksquashfs for ubuntu builds according to Adam Conrad <adconrad at ubuntu.com>.
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index 6704b52..41c284a 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)
--
live-build
More information about the debian-live-changes
mailing list