manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving chroot exclude mechanisms to one central place in binary_chroot helper.

This commit is contained in:
Daniel Baumann 2010-06-22 17:19:24 +02:00
parent d77aad8bb5
commit cd3048d00c
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
helpers/binary_chroot
View File

@ -110,6 +110,37 @@ then
done
fi
# Handling chroot excludes
if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
then
if [ -f config/binary_rootfs/excludes ]
then
cp config/binary_rootfs/excludes chroot/chroot/excludes
chroot chroot/chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
rm -f chroot/chroot/excludes
fi
if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
then
case "${LH_PACKAGES_LISTS}" in
stripped|minimal)
# kernel images
rm -f chroot/chroot/boot/${LINUX}*
rm -f chroot/chroot/boot/initrd.img*
# kernel symlinks
rm -f chroot/chroot/${LINUX}*
rm -f chroot/chroot/initrd.img*
;;
esac
fi
else
if [ "${LH_CHROOT_FILESYSTEM}" != "squashfs" ]
then
Echo_warning "rootfs excludes are not supported on non-chrooted builds unless squashfs as chroot filesystem is used, thus ignoring excludes now."
fi
fi
if [ -n "${LH_ROOT_COMMAND}" ]
then
${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot

31
helpers/binary_rootfs
View File

@ -82,37 +82,6 @@ do
fi
done
# Handling chroot excludes
if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
then
if [ -f config/binary_rootfs/excludes ]
then
cp config/binary_rootfs/excludes chroot/chroot/excludes
chroot chroot/chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
rm -f chroot/chroot/excludes
fi
if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
then
case "${LH_PACKAGES_LISTS}" in
stripped|minimal)
# kernel images
rm -f chroot/chroot/boot/${LINUX}*
rm -f chroot/chroot/boot/initrd.img*
# kernel symlinks
rm -f chroot/chroot/${LINUX}*
rm -f chroot/chroot/initrd.img*
;;
esac
fi
else
if [ "${LH_CHROOT_FILESYSTEM}" != "squashfs" ]
then
Echo_warning "rootfs excludes are not supported on non-chrooted builds unless squashfs as chroot filesystem is used, thus ignoring excludes now."
fi
fi
case "${LH_CHROOT_FILESYSTEM}" in
ext2|ext3)
# Checking depends