From: Zhenhua Luo <zhenhua.luo@nxp.com>
Date: Mon, 13 Jun 2016 11:47:34 +0000 (+0800)
Subject: image.bbclass: do exact match for rootfs type
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1d0ea655e266e7c5acc9c282fa91406fbe9bfb85;p=openembedded-core.git

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

(From OE-Core rev: 46bc438374de74af76d288520c6252c9b7840767)

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 6b9f9798db..64eb845fbe 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:]