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:20 +0000 |
| commit | 0db0bb61bfa2d17340f4052a40e7486f569ca727 (patch) | |
| tree | b6d2360db0271babef858eee17266ebfea6731da /meta/classes/image_types.bbclass | |
| parent | aed1f0cbac478768bd1b5cd6c12293c549121275 (diff) | |
| download | poky-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>
Diffstat (limited to 'meta/classes/image_types.bbclass')
| -rw-r--r-- | meta/classes/image_types.bbclass | 4 |
1 files changed, 1 insertions, 3 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 | ||
| 36 | JFFS2_SUM_EXTRA_ARGS ?= "" | 36 | JFFS2_SUM_EXTRA_ARGS ?= "" |
| 37 | IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" | 37 | IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" |
| 38 | IMAGE_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 | ||
| 40 | IMAGE_CMD_cramfs = "mkfs.cramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" | 39 | IMAGE_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 | ||
| 117 | IMAGE_DEPENDS = "" | 116 | IMAGE_DEPENDS = "" |
| 118 | IMAGE_DEPENDS_jffs2 = "mtd-utils-native" | 117 | IMAGE_DEPENDS_jffs2 = "mtd-utils-native" |
| 119 | IMAGE_DEPENDS_sum.jffs2 = "mtd-utils-native" | ||
| 120 | IMAGE_DEPENDS_cramfs = "util-linux-native" | 118 | IMAGE_DEPENDS_cramfs = "util-linux-native" |
| 121 | IMAGE_DEPENDS_ext2 = "e2fsprogs-native" | 119 | IMAGE_DEPENDS_ext2 = "e2fsprogs-native" |
| 122 | IMAGE_DEPENDS_ext3 = "e2fsprogs-native" | 120 | IMAGE_DEPENDS_ext3 = "e2fsprogs-native" |
| @@ -129,7 +127,7 @@ IMAGE_DEPENDS_ubi = "mtd-utils-native" | |||
| 129 | IMAGE_DEPENDS_ubifs = "mtd-utils-native" | 127 | IMAGE_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 |
| 132 | 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" | 130 | 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" |
| 133 | 131 | ||
| 134 | COMPRESSIONTYPES = "gz bz2 lzma xz lz4 sum" | 132 | COMPRESSIONTYPES = "gz bz2 lzma xz lz4 sum" |
| 135 | COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}" | 133 | COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}" |