[SCM] live-build branch, debian-old-2.0, updated. debian/2.0.1-1-8-gd4e5cb3
Daniel Baumann
daniel at debian.org
Thu Sep 30 15:30:22 UTC 2010
The following commit has been merged in the debian-old-2.0 branch:
commit d4e5cb3a3e900b82be1db672fa43fb1244de89f7
Author: intrigeri <intrigeri at boum.org>
Date: Thu Sep 30 17:29:32 2010 +0200
Fixing squashfs.sort location with --build-with-chroot false.
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 27af099..b5ca068 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -307,7 +307,16 @@ case "${LB_CHROOT_FILESYSTEM}" in
if [ -f config/binary_rootfs/squashfs.sort ]
then
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort"
- cp config/binary_rootfs/squashfs.sort chroot #FIXME
+
+ case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ cp config/binary_rootfs/squashfs.sort chroot
+ ;;
+
+ false)
+ cp config/binary_rootfs/squashfs.sort .
+ ;;
+ esac
fi
case "${LB_BUILD_WITH_CHROOT}" in
--
live-build
More information about the debian-live-changes
mailing list