[OE-core] [PATCH] image.bbclass: do exact match for rootfs type

Davis, Michael michael.davis at essvote.com
Thu Jun 30 17:08:23 UTC 2016


From: Zhenhua Luo <zhenhua.luo at nxp.com>

Do exact match for rootfs type, instead of pattern match, to avoid
unexpected build error due to redundant rootfs type build.

E.g. when building ext2.gz.u-boot, both .gz.u-boot and .u-boot are matched,
the following build error will appear, actually .u-boot is not needed.
| mkimage: Can't open .../core-image-minimal-<machine>-<yyyymmddhhmmss>.rootfs.ext2.gz: No such file or directory

(From OE-Core rev: 46bc438374de74af76d288520c6252c9b7840767)

(From OE-Core rev: 1d0ea655e266e7c5acc9c282fa91406fbe9bfb85)

Signed-off-by: Zhenhua Luo <zhenhua.luo at nxp.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 6b9f979..64eb845 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -395,7 +395,7 @@ python () {
         rm_tmp_images = set()
         def gen_conversion_cmds(bt):
             for ctype in ctypes:
-                if bt.endswith("." + ctype):
+                if bt[bt.find('.') + 1:] == ctype:
                     type = bt[0:-len(ctype) - 1]
                     if type.startswith("debugfs_"):
                         type = type[8:]
-- 
2.5.5



More information about the Openembedded-core mailing list