summaryrefslogtreecommitdiffstats
path: root/meta/classes/image-live.bbclass
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-02-12 13:05:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-24 10:31:45 +0000
commitd594496190c0a4009a7690adbf54e80a95f36642 (patch)
treedaccb1e79eff25f99f038fc671d8afa95164c8ea /meta/classes/image-live.bbclass
parent1dd146d5acd6bb4c0d65045071e2fd27590b8df4 (diff)
downloadpoky-d594496190c0a4009a7690adbf54e80a95f36642.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 (From OE-Core rev: 9443981d3934b366e39404719486d2b34d8a9d73) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image-live.bbclass')
-rw-r--r--meta/classes/image-live.bbclass17
1 files changed, 2 insertions, 15 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 @@
19 19
20# External variables (also used by syslinux.bbclass) 20# External variables (also used by syslinux.bbclass)
21# ${INITRD} - indicates a list of filesystem images to concatenate and use as an initrd (optional) 21# ${INITRD} - indicates a list of filesystem images to concatenate and use as an initrd (optional)
22# ${COMPRESSISO} - Transparent compress ISO, reduce size ~40% if set to 1
23# ${NOISO} - skip building the ISO image if set to 1 22# ${NOISO} - skip building the ISO image if set to 1
24# ${NOHDD} - skip building the HDD image if set to 1 23# ${NOHDD} - skip building the HDD image if set to 1
25# ${HDDIMG_ID} - FAT image volume-id 24# ${HDDIMG_ID} - FAT image volume-id
@@ -33,7 +32,6 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
33 virtual/kernel:do_deploy \ 32 virtual/kernel:do_deploy \
34 ${MLPREFIX}syslinux:do_populate_sysroot \ 33 ${MLPREFIX}syslinux:do_populate_sysroot \
35 syslinux-native:do_populate_sysroot \ 34 syslinux-native:do_populate_sysroot \
36 ${@oe.utils.ifelse(d.getVar('COMPRESSISO', False),'zisofs-tools-native:do_populate_sysroot','')} \
37 ${PN}:do_image_${@d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')} \ 35 ${PN}:do_image_${@d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')} \
38 " 36 "
39 37
@@ -65,7 +63,6 @@ HDDDIR = "${S}/hddimg"
65ISODIR = "${S}/iso" 63ISODIR = "${S}/iso"
66EFIIMGDIR = "${S}/efi_img" 64EFIIMGDIR = "${S}/efi_img"
67COMPACT_ISODIR = "${S}/iso.z" 65COMPACT_ISODIR = "${S}/iso.z"
68COMPRESSISO ?= "0"
69 66
70ISOLINUXDIR ?= "/isolinux" 67ISOLINUXDIR ?= "/isolinux"
71ISO_BOOTIMG = "isolinux/isolinux.bin" 68ISO_BOOTIMG = "isolinux/isolinux.bin"
@@ -115,18 +112,8 @@ build_iso() {
115 install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR} 112 install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR}
116 fi 113 fi
117 114
118 if [ "${COMPRESSISO}" = "1" ] ; then 115 # We used to have support for zisofs; this is a relic of that
119 # create compact directory, compress iso 116 mkisofs_compress_opts="-r"
120 mkdir -p ${COMPACT_ISODIR}
121 mkzftree -z 9 -p 4 -F ${ISODIR}/rootfs.img ${COMPACT_ISODIR}/rootfs.img
122
123 # move compact iso to iso, then remove compact directory
124 mv ${COMPACT_ISODIR}/rootfs.img ${ISODIR}/rootfs.img
125 rm -Rf ${COMPACT_ISODIR}
126 mkisofs_compress_opts="-R -z -D -l"
127 else
128 mkisofs_compress_opts="-r"
129 fi
130 117
131 # Check the size of ${ISODIR}/rootfs.img, use mkisofs -iso-level 3 118 # Check the size of ${ISODIR}/rootfs.img, use mkisofs -iso-level 3
132 # when it exceeds 3.8GB, the specification is 4G - 1 bytes, we need 119 # when it exceeds 3.8GB, the specification is 4G - 1 bytes, we need