diff options
| author |   Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com> | 2014-02-13 16:06:22 +0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-14 12:30:06 +0000 |
| commit | 295c6c1452c8789a8b1d0090ff09a5cd7cf16507 (patch) | |
| tree | 30e7d84d881a4bc629b3786980b295c4fd50e691 /meta | |
| parent | 2a15a364fdf85b0b18ba63fdb2a745a52b96478e (diff) | |
| download | openembedded-core-contrib-295c6c1452c8789a8b1d0090ff09a5cd7cf16507.tar.gz | |
image_types: sum.jffs2 is replaced by jffs2.sum
Previous commit added support for sum 'compression' (rather
postprocessing) of jffs2 images. Drop support for sum.jffs2 image type.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/image_types.bbclass | 4 | ||||
| -rw-r--r-- | meta/lib/oe/image.py | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index be56abb2f1..0467abdec2 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -35,7 +35,6 @@ XZ_THREADS ?= "-T 0" JFFS2_SUM_EXTRA_ARGS ?= "" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" -IMAGE_CMD_sum.jffs2 = "sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sum.jffs2 ${EXTRA_IMAGECMD}" IMAGE_CMD_cramfs = "mkfs.cramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" @@ -116,7 +115,6 @@ EXTRA_IMAGECMD_elf ?= "" IMAGE_DEPENDS = "" IMAGE_DEPENDS_jffs2 = "mtd-utils-native" -IMAGE_DEPENDS_sum.jffs2 = "mtd-utils-native" IMAGE_DEPENDS_cramfs = "util-linux-native" IMAGE_DEPENDS_ext2 = "e2fsprogs-native" IMAGE_DEPENDS_ext3 = "e2fsprogs-native" @@ -129,7 +127,7 @@ IMAGE_DEPENDS_ubi = "mtd-utils-native" IMAGE_DEPENDS_ubifs = "mtd-utils-native" # This variable is available to request which values are suitable for IMAGE_FSTYPES -IMAGE_TYPES = "jffs2 jffs2.sum sum.jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma btrfs iso hddimg squashfs squashfs-xz ubi ubifs tar tar.gz tar.bz2 tar.xz tar.lz4 cpio cpio.gz cpio.xz cpio.lzma cpio.lz4 vmdk elf" +IMAGE_TYPES = "jffs2 jffs2.sum cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma btrfs iso hddimg squashfs squashfs-xz ubi ubifs tar tar.gz tar.bz2 tar.xz tar.lz4 cpio cpio.gz cpio.xz cpio.lzma cpio.lz4 vmdk elf" COMPRESSIONTYPES = "gz bz2 lzma xz lz4 sum" COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}" diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py index 54f7c84cf7..c15296f5c0 100644 --- a/meta/lib/oe/image.py +++ b/meta/lib/oe/image.py @@ -102,9 +102,6 @@ class Image(object): # been created, so we add that explicit ordering here. addtypedepends("elf", "cpio.gz") - # jffs2 sumtool'd images need jffs2 - addtypedepends("sum.jffs2", "jffs2") - # Filter out all the compressed images from alltypes for type in alltypes: basetype = None |