[oe-commits] [openembedded-core] 04/14: image.bbclass: do exact match for rootfs type

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 0eeec43e69e9e2dac4494c18078d324a191ceef8
Author: Zhenhua Luo <zhenhua.luo at nxp.com>
AuthorDate: Mon Jun 13 19:47:34 2016 +0800

    image.bbclass: do exact match for rootfs type
    
    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
    
    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 65ce6bb..2577cca 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -404,7 +404,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:]

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.