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-08-29 11:57:29 +0100
commit88eec32150c025bae6f3c381152b0772990d0751 (patch)
tree1c4599c3fd2d5b638be61d0be39c00afbf81ec1d /meta/classes/image.bbclass
parent5a20323f2076b74e82f168f691f942df4b9bf93a (diff)
downloadpoky-88eec32150c025bae6f3c381152b0772990d0751.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: ad22f73519292f53d2ea6eaae99f8a919c4f2c26) 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) Signed-off-by: Armin Kuster <akuster808@gmail.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 405fd73c04..4b208c94f1 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -454,7 +454,7 @@ python () {
454 rm_tmp_images = set() 454 rm_tmp_images = set()
455 def gen_conversion_cmds(bt): 455 def gen_conversion_cmds(bt):
456 for ctype in ctypes: 456 for ctype in ctypes:
457 if bt[bt.find('.') + 1:] == ctype: 457 if bt.endswith("." + ctype):
458 type = bt[0:-len(ctype) - 1] 458 type = bt[0:-len(ctype) - 1]
459 if type.startswith("debugfs_"): 459 if type.startswith("debugfs_"):
460 type = type[8:] 460 type = type[8:]