From 0a7ce0b971a208956cb895ba5a869ec8c5d94703 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 21 Jul 2017 18:06:33 -0400 Subject: 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 Cc: Richard Purdie Cc: Patrick Ohly Signed-off-by: Tom Rini Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/image.bbclass') 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 () { rm_tmp_images = set() def gen_conversion_cmds(bt): for ctype in ctypes: - if bt[bt.find('.') + 1:] == ctype: + if bt.endswith("." + ctype): type = bt[0:-len(ctype) - 1] if type.startswith("debugfs_"): type = type[8:] -- cgit 1.2.3-korg