diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-09-30 09:33:06 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-09-30 09:33:06 +0200 |
| commit | 2046ad7fdd0aebc26ff3ffb625c4446e83b76b68 (patch) | |
| tree | a043d2c561bc5d0e5c72627df3e54d1b24d0ad38 | |
| parent | 01b64bf2b9b99df5dbeb7211646f5203a4f7bc00 (diff) | |
| download | vyos-live-build-2046ad7fdd0aebc26ff3ffb625c4446e83b76b68.tar.gz vyos-live-build-2046ad7fdd0aebc26ff3ffb625c4446e83b76b68.zip | |
Don't turn on xz compression in mksquashfs for ubuntu builds according to Adam Conrad <adconrad@ubuntu.com>.
| -rwxr-xr-x | scripts/build/binary_rootfs | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index 6704b524a..41c284ac2 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -357,16 +357,11 @@ case "${LB_CHROOT_FILESYSTEM}" in esac fi - case "${LB_PARENT_DISTRIBUTION}" in - squeeze) - - ;; - - *) - # FIXME: artax-backports too, once d-i has catched up - MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz" - ;; - esac + if [ "${LB_PARENT_DISTRIBUTION}" != "squeeze" ] && \ + [ "${LB_MODE}" != "ubuntu" ] + then + MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz" + fi case "${LB_BUILD_WITH_CHROOT}" in true) |