summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-06-03 00:21:07 +0200
committerDaniel Baumann <daniel@debian.org>2011-06-03 00:38:09 +0200
commitb8eff5a2f2720dcf8aca9e5c681c32c64207a719 (patch)
tree2dd2c86296d47b53e5ed73671ae0e4ebe54516f4 /scripts/build
parent3cd5375fbd5c53d752a60e1106a9e775969ee326 (diff)
downloadvyos-live-build-b8eff5a2f2720dcf8aca9e5c681c32c64207a719.tar.gz
vyos-live-build-b8eff5a2f2720dcf8aca9e5c681c32c64207a719.zip
Restoring excludes functionality for mksquashfs. This was present some time ago but then got removed.
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/lb_binary_chroot2
-rwxr-xr-xscripts/build/lb_binary_rootfs14
2 files changed, 15 insertions, 1 deletions
diff --git a/scripts/build/lb_binary_chroot b/scripts/build/lb_binary_chroot
index 3ce9708b9..4f02e509e 100755
--- a/scripts/build/lb_binary_chroot
+++ b/scripts/build/lb_binary_chroot
@@ -97,7 +97,7 @@ fi
${LB_ROOT_COMMAND} mv chroot.tmp chroot/chroot
# Handling chroot excludes
-if [ -f config/binary_rootfs/excludes ]
+if [ -f config/binary_rootfs/excludes ] && [ "${LB_CHROOT_FILESYSTEM}" != "squashfs" ]
then
case "${LB_BUILD_WITH_CHROOT}" in
true)
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 2e3e34e3f..52204d4ac 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -323,9 +323,18 @@ case "${LB_CHROOT_FILESYSTEM}" in
case "${LB_BUILD_WITH_CHROOT}" in
true)
+ if [ -e config/binary_rootfs/excludes ]
+ then
+ cp config/binary_rootfs/excludes chroot/excludes
+
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -ef /excludes"
+ fi
+
# Create image
Chroot chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
+ rm -f chroot/chroot/excludes
+
case "${LB_MODE}" in
ubuntu)
du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
@@ -384,6 +393,11 @@ case "${LB_CHROOT_FILESYSTEM}" in
;;
false)
+ if [ -e config/binary_rootfs/excludes ]
+ then
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -ef config/binary_rootfs/excludes"
+ fi
+
mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
case "${LB_MODE}" in