diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-02-12 13:05:16 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-24 10:31:35 +0000 |
| commit | 9443981d3934b366e39404719486d2b34d8a9d73 (patch) | |
| tree | 4729368cd9b57e8dd88360a69f638e755a5d2c74 | |
| parent | a62a7e11274c4965e122ed5bf01024cae8437af0 (diff) | |
| download | openembedded-core-9443981d3934b366e39404719486d2b34d8a9d73.tar.gz | |
image-live.bbclass: drop support for compressed ISO images
While modern Linux kernels still support it, the userspace tools
haven't been updated in over a decade. Also, squashfs provides
both better performance, and better compression ratio:
https://elinux.org/Squash_Fs_Comparisons
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/image-live.bbclass | 17 | ||||
| -rw-r--r-- | meta/conf/distro/include/maintainers.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb | 20 |
3 files changed, 2 insertions, 36 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index 1623c15988..966277c678 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass @@ -19,7 +19,6 @@ # External variables (also used by syslinux.bbclass) # ${INITRD} - indicates a list of filesystem images to concatenate and use as an initrd (optional) -# ${COMPRESSISO} - Transparent compress ISO, reduce size ~40% if set to 1 # ${NOISO} - skip building the ISO image if set to 1 # ${NOHDD} - skip building the HDD image if set to 1 # ${HDDIMG_ID} - FAT image volume-id @@ -33,7 +32,6 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \ virtual/kernel:do_deploy \ ${MLPREFIX}syslinux:do_populate_sysroot \ syslinux-native:do_populate_sysroot \ - ${@oe.utils.ifelse(d.getVar('COMPRESSISO', False),'zisofs-tools-native:do_populate_sysroot','')} \ ${PN}:do_image_${@d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')} \ " @@ -65,7 +63,6 @@ HDDDIR = "${S}/hddimg" ISODIR = "${S}/iso" EFIIMGDIR = "${S}/efi_img" COMPACT_ISODIR = "${S}/iso.z" -COMPRESSISO ?= "0" ISOLINUXDIR ?= "/isolinux" ISO_BOOTIMG = "isolinux/isolinux.bin" @@ -115,18 +112,8 @@ build_iso() { install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR} fi - if [ "${COMPRESSISO}" = "1" ] ; then - # create compact directory, compress iso - mkdir -p ${COMPACT_ISODIR} - mkzftree -z 9 -p 4 -F ${ISODIR}/rootfs.img ${COMPACT_ISODIR}/rootfs.img - - # move compact iso to iso, then remove compact directory - mv ${COMPACT_ISODIR}/rootfs.img ${ISODIR}/rootfs.img - rm -Rf ${COMPACT_ISODIR} - mkisofs_compress_opts="-R -z -D -l" - else - mkisofs_compress_opts="-r" - fi + # We used to have support for zisofs; this is a relic of that + mkisofs_compress_opts="-r" # Check the size of ${ISODIR}/rootfs.img, use mkisofs -iso-level 3 # when it exceeds 3.8GB, the specification is 4G - 1 bytes, we need diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 48e20c77fc..505fec0337 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -805,5 +805,4 @@ RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <akuster@mvista.com>" RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <denys@ti.com>" RECIPE_MAINTAINER_pn-yasm = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <denys@ti.com>" -RECIPE_MAINTAINER_pn-zisofs-tools-native = "Alexander Kanavin <alexander.kanavin@intel.com>" RECIPE_MAINTAINER_pn-zlib = "Denys Dmytriyenko <denys@ti.com>" diff --git a/meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb b/meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb deleted file mode 100644 index 021c05839c..0000000000 --- a/meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb +++ /dev/null @@ -1,20 +0,0 @@ -# zisofs-tools-native OE build file -# Copyright (C) 1989, 1991 Free Software Foundation, Inc. -SUMMARY = "Utilities for creating compressed CD-ROM filesystems" -HOMEPAGE = "http://freecode.com/projects/zisofs-tools" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "zlib-native" - -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/zisofs-tools/zisofs-tools-${PV}.tar.bz2/2d0ed8c9a1f60b45f949b136f9be1f6c/zisofs-tools-${PV}.tar.bz2" - -SRC_URI[md5sum] = "2d0ed8c9a1f60b45f949b136f9be1f6c" -SRC_URI[sha256sum] = "ae4e53e4914934d41660248fb59d3c8761f1f1fd180d5ec993c17ddb3afd04f3" - -inherit native - -do_install() { - oe_runmake install INSTALLROOT=${D} bindir=${bindir} -} |