From 279a149d8a2e01a7fbb7e002c5a38e4b82ccd74e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 3 May 2015 15:53:27 +0200 Subject: Dropping automagics for ubuntu. Future live-build versions will still allow to use casper, but its configuration will be done differently by a custom config tree, rather than embedded and maintenance intensive code in live-build itself. --- scripts/build/binary_rootfs | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'scripts/build/binary_rootfs') diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index ba2f49a22..f4fa0f67e 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -137,11 +137,7 @@ case "${LB_CHROOT_FILESYSTEM}" in # Move image mv chroot/filesystem.${LB_CHROOT_FILESYSTEM} binary/${INITFS} - case "${LB_MODE}" in - ubuntu) - du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size - ;; - esac + du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size if [ -e chroot/chroot.cache ] then @@ -348,10 +344,7 @@ case "${LB_CHROOT_FILESYSTEM}" in esac fi - if [ "${LB_MODE}" != "ubuntu" ] - then - MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz" - fi + MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz" case "${LB_BUILD_WITH_CHROOT}" in true) @@ -367,11 +360,7 @@ case "${LB_CHROOT_FILESYSTEM}" in rm -f chroot/chroot/excludes - case "${LB_MODE}" in - ubuntu) - du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size - ;; - esac + du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size # Move image mv chroot/filesystem.squashfs binary/${INITFS} @@ -432,11 +421,7 @@ case "${LB_CHROOT_FILESYSTEM}" in mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS} - case "${LB_MODE}" in - ubuntu) - du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size - ;; - esac + du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size ;; esac -- cgit v1.2.3