diff options
-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 @@ | |||
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 |
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>" | |||
805 | RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <denys@ti.com>" | 805 | RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <denys@ti.com>" |
806 | RECIPE_MAINTAINER_pn-yasm = "Yi Zhao <yi.zhao@windriver.com>" | 806 | RECIPE_MAINTAINER_pn-yasm = "Yi Zhao <yi.zhao@windriver.com>" |
807 | RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <denys@ti.com>" | 807 | RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <denys@ti.com>" |
808 | RECIPE_MAINTAINER_pn-zisofs-tools-native = "Alexander Kanavin <alexander.kanavin@intel.com>" | ||
809 | RECIPE_MAINTAINER_pn-zlib = "Denys Dmytriyenko <denys@ti.com>" | 808 | 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 @@ | |||
1 | # zisofs-tools-native OE build file | ||
2 | # Copyright (C) 1989, 1991 Free Software Foundation, Inc. | ||
3 | SUMMARY = "Utilities for creating compressed CD-ROM filesystems" | ||
4 | HOMEPAGE = "http://freecode.com/projects/zisofs-tools" | ||
5 | SECTION = "console/utils" | ||
6 | LICENSE = "GPLv2" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
8 | |||
9 | DEPENDS = "zlib-native" | ||
10 | |||
11 | SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/zisofs-tools/zisofs-tools-${PV}.tar.bz2/2d0ed8c9a1f60b45f949b136f9be1f6c/zisofs-tools-${PV}.tar.bz2" | ||
12 | |||
13 | SRC_URI[md5sum] = "2d0ed8c9a1f60b45f949b136f9be1f6c" | ||
14 | SRC_URI[sha256sum] = "ae4e53e4914934d41660248fb59d3c8761f1f1fd180d5ec993c17ddb3afd04f3" | ||
15 | |||
16 | inherit native | ||
17 | |||
18 | do_install() { | ||
19 | oe_runmake install INSTALLROOT=${D} bindir=${bindir} | ||
20 | } | ||