summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dmitry_eremin@mentor.com>2014-02-13 16:06:22 +0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-14 12:30:20 +0000
commit0db0bb61bfa2d17340f4052a40e7486f569ca727 (patch)
treeb6d2360db0271babef858eee17266ebfea6731da
parentaed1f0cbac478768bd1b5cd6c12293c549121275 (diff)
downloadpoky-0db0bb61bfa2d17340f4052a40e7486f569ca727.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. (From OE-Core rev: 295c6c1452c8789a8b1d0090ff09a5cd7cf16507) Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image_types.bbclass4
-rw-r--r--meta/lib/oe/image.py3
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"
35 35
36JFFS2_SUM_EXTRA_ARGS ?= "" 36JFFS2_SUM_EXTRA_ARGS ?= ""
37IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" 37IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
38IMAGE_CMD_sum.jffs2 = "sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sum.jffs2 ${EXTRA_IMAGECMD}"
39 38
40IMAGE_CMD_cramfs = "mkfs.cramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" 39IMAGE_CMD_cramfs = "mkfs.cramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
41 40
@@ -116,7 +115,6 @@ EXTRA_IMAGECMD_elf ?= ""
116 115
117IMAGE_DEPENDS = "" 116IMAGE_DEPENDS = ""
118IMAGE_DEPENDS_jffs2 = "mtd-utils-native" 117IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
119IMAGE_DEPENDS_sum.jffs2 = "mtd-utils-native"
120IMAGE_DEPENDS_cramfs = "util-linux-native" 118IMAGE_DEPENDS_cramfs = "util-linux-native"
121IMAGE_DEPENDS_ext2 = "e2fsprogs-native" 119IMAGE_DEPENDS_ext2 = "e2fsprogs-native"
122IMAGE_DEPENDS_ext3 = "e2fsprogs-native" 120IMAGE_DEPENDS_ext3 = "e2fsprogs-native"
@@ -129,7 +127,7 @@ IMAGE_DEPENDS_ubi = "mtd-utils-native"
129IMAGE_DEPENDS_ubifs = "mtd-utils-native" 127IMAGE_DEPENDS_ubifs = "mtd-utils-native"
130 128
131# This variable is available to request which values are suitable for IMAGE_FSTYPES 129# This variable is available to request which values are suitable for IMAGE_FSTYPES
132IMAGE_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" 130IMAGE_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"
133 131
134COMPRESSIONTYPES = "gz bz2 lzma xz lz4 sum" 132COMPRESSIONTYPES = "gz bz2 lzma xz lz4 sum"
135COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}" 133COMPRESS_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):
102 # been created, so we add that explicit ordering here. 102 # been created, so we add that explicit ordering here.
103 addtypedepends("elf", "cpio.gz") 103 addtypedepends("elf", "cpio.gz")
104 104
105 # jffs2 sumtool'd images need jffs2
106 addtypedepends("sum.jffs2", "jffs2")
107
108 # Filter out all the compressed images from alltypes 105 # Filter out all the compressed images from alltypes
109 for type in alltypes: 106 for type in alltypes:
110 basetype = None 107 basetype = None