diff options
Diffstat (limited to 'meta/classes/image-live.bbclass')
-rw-r--r-- | meta/classes/image-live.bbclass | 17 |
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" | |||
65 | ISODIR = "${S}/iso" | 63 | ISODIR = "${S}/iso" |
66 | EFIIMGDIR = "${S}/efi_img" | 64 | EFIIMGDIR = "${S}/efi_img" |
67 | COMPACT_ISODIR = "${S}/iso.z" | 65 | COMPACT_ISODIR = "${S}/iso.z" |
68 | COMPRESSISO ?= "0" | ||
69 | 66 | ||
70 | ISOLINUXDIR ?= "/isolinux" | 67 | ISOLINUXDIR ?= "/isolinux" |
71 | ISO_BOOTIMG = "isolinux/isolinux.bin" | 68 | ISO_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 |