summaryrefslogtreecommitdiffstats
path: root/meta/classes/image.bbclass
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-07-21 18:06:33 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-25 15:59:13 +0100
commit6fbbdc626a612826378ca979dab4455aed6f8332 (patch)
tree8aff0f5b8e5d8c9b37db05cdfd8981e70aae7bc0 /meta/classes/image.bbclass
parent975bea4400ec1817537fb4a91723b75a242d4a10 (diff)
downloadpoky-6fbbdc626a612826378ca979dab4455aed6f8332.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: 0a7ce0b971a208956cb895ba5a869ec8c5d94703) 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>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r--meta/classes/image.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index de535ce6fc..bd6a5b7b81 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -453,7 +453,7 @@ python () {
453 rm_tmp_images = set() 453 rm_tmp_images = set()
454 def gen_conversion_cmds(bt): 454 def gen_conversion_cmds(bt):
455 for ctype in ctypes: 455 for ctype in ctypes:
456 if bt[bt.find('.') + 1:] == ctype: 456 if bt.endswith("." + ctype):
457 type = bt[0:-len(ctype) - 1] 457 type = bt[0:-len(ctype) - 1]
458 if type.startswith("debugfs_"): 458 if type.startswith("debugfs_"):
459 type = type[8:] 459 type = type[8:]