[gnome-continuous-yocto/gnomeostree-3.28-rocko: 867/8267] image.bbclass: do exact match for rootfs type



commit 7028192246552fd9e4aa3674da9c30670fd4ec86
Author: Zhenhua Luo <zhenhua luo nxp com>
Date:   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
    
    (From OE-Core rev: 46bc438374de74af76d288520c6252c9b7840767)
    
    Signed-off-by: Zhenhua Luo <zhenhua luo nxp com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
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:]


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]