summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-07-21 18:06:33 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 16:50:54 +0100
commit341726ffdba0f7dfa2056b9c501e20ef600a51cb (patch)
treeebe5bf93e5ee16397c3f5d41d55f55520763ccbc /meta/classes
parent07e5111828d6cad3133beb23e50312e4a5d6b73c (diff)
downloadpoky-341726ffdba0f7dfa2056b9c501e20ef600a51cb.tar.gz
image.bbclass: Correct chaining compression support
When chaining of compression/conversion types was added, we had a new way to handle doing things like "ext4.bz2.sha256sum" or "ext2.gz.u-boot". However, because the U-Boot image class isn't included normally, it wasn't properly converted at the time. After the support was added the "clean" argument that the .u-boot code uses no longer functions. The fix for this inadvertently broke chaining compression/conversion. First, correct the u-boot conversion code. Fixes: 46bc438374de ("image.bbclass: do exact match for rootfs type") Cc: Zhenhua Luo <zhenhua.luo@nxp.com> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Patrick Ohly <patrick.ohly@intel.com> (From OE-Core rev: e1546856890a438b5ea3763af3cdc13db8e8f236) Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 0a7ce0b971a208956cb895ba5a869ec8c5d94703) excluded lz4 and lzo chnages Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/image_types_uboot.bbclass9
2 files changed, 4 insertions, 7 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 6111f6d266..cf38d2a117 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -457,7 +457,7 @@ python () {
457 rm_tmp_images = set() 457 rm_tmp_images = set()
458 def gen_conversion_cmds(bt): 458 def gen_conversion_cmds(bt):
459 for ctype in ctypes: 459 for ctype in ctypes:
460 if bt[bt.find('.') + 1:] == ctype: 460 if bt.endswith("." + ctype):
461 type = bt[0:-len(ctype) - 1] 461 type = bt[0:-len(ctype) - 1]
462 if type.startswith("debugfs_"): 462 if type.startswith("debugfs_"):
463 type = type[8:] 463 type = type[8:]
diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass
index 6c8c1ff60e..933fa4d9c2 100644
--- a/meta/classes/image_types_uboot.bbclass
+++ b/meta/classes/image_types_uboot.bbclass
@@ -3,9 +3,6 @@ inherit image_types kernel-arch
3oe_mkimage () { 3oe_mkimage () {
4 mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \ 4 mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \
5 -d ${IMGDEPLOYDIR}/$1 ${IMGDEPLOYDIR}/$1.u-boot 5 -d ${IMGDEPLOYDIR}/$1 ${IMGDEPLOYDIR}/$1.u-boot
6 if [ x$3 = x"clean" ]; then
7 rm $1
8 fi
9} 6}
10 7
11CONVERSIONTYPES += "gz.u-boot bz2.u-boot lzma.u-boot u-boot" 8CONVERSIONTYPES += "gz.u-boot bz2.u-boot lzma.u-boot u-boot"
@@ -14,13 +11,13 @@ CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native"
14CONVERSION_CMD_u-boot = "oe_mkimage ${IMAGE_NAME}.rootfs.${type} none" 11CONVERSION_CMD_u-boot = "oe_mkimage ${IMAGE_NAME}.rootfs.${type} none"
15 12
16CONVERSION_DEPENDS_gz.u-boot = "u-boot-mkimage-native" 13CONVERSION_DEPENDS_gz.u-boot = "u-boot-mkimage-native"
17CONVERSION_CMD_gz.u-boot = "${CONVERSION_CMD_gz}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.gz gzip clean" 14CONVERSION_CMD_gz.u-boot = "${CONVERSION_CMD_gz}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.gz gzip"
18 15
19CONVERSION_DEPENDS_bz2.u-boot = "u-boot-mkimage-native" 16CONVERSION_DEPENDS_bz2.u-boot = "u-boot-mkimage-native"
20CONVERSION_CMD_bz2.u-boot = "${CONVERSION_CMD_bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.bz2 bzip2 clean" 17CONVERSION_CMD_bz2.u-boot = "${CONVERSION_CMD_bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.bz2 bzip2"
21 18
22CONVERSION_DEPENDS_lzma.u-boot = "u-boot-mkimage-native" 19CONVERSION_DEPENDS_lzma.u-boot = "u-boot-mkimage-native"
23CONVERSION_CMD_lzma.u-boot = "${CONVERSION_CMD_lzma}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.lzma lzma clean" 20CONVERSION_CMD_lzma.u-boot = "${CONVERSION_CMD_lzma}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.lzma lzma"
24 21
25IMAGE_TYPES += "ext2.u-boot ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot ext3.gz.u-boot ext4.gz.u-boot cpio.gz.u-boot" 22IMAGE_TYPES += "ext2.u-boot ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot ext3.gz.u-boot ext4.gz.u-boot cpio.gz.u-boot"
26 23