Restoring excludes functionality for mksquashfs. This was present some time ago but then got removed.

This commit is contained in:
Daniel Baumann 2011-06-03 00:21:07 +02:00
parent 3cd5375fbd
commit b8eff5a2f2
2 changed files with 15 additions and 1 deletions

View File

@ -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)

View File

@ -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