[oe-commits] [openembedded-core] 03/03: image.bbclass: The wrong name is being used for the debug filesystem

[git at git.openembedded.org]

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

commit ca088bebfc3603ef206b20501916019f0572f955
Author: Mark Hatle <mark.hatle at windriver.com>
AuthorDate: Tue Apr 19 10:01:11 2016 -0500

    image.bbclass: The wrong name is being used for the debug filesystem
    
    [YOCTO #9487]
    
    The debug filesystem file name is ending in "debug_tar", it should be simply
    "tar".  Strip the "debug_" piece as necessary.
    
    To avoid deleting the tar ball, when we've asked for just the tarball we need
    to check 't' and not 'realt'.
    
    The two hunks were suggested by RP.  I've implemented and verify they work
    with the settings:
    
    PACKAGE_CLASSES = "package_rpm"
    IMAGE_GEN_DEBUGFS = '1'
    
    IMAGE_FSTYPES_DEBUGFS = "tar.bz2"
    
    IMAGE_FSTYPES_DEBUGFS = "tar.gz"
    
    and
    
    IMAGE_FSTYPES_DEBUGFS = "tar"
    
    Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/image.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index f471f1a..8bfd241 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -393,6 +393,8 @@ python () {
             for ctype in ctypes:
                 if bt.endswith("." + ctype):
                     type = bt[0:-len(ctype) - 1]
+                    if type.startswith("debugfs_"):
+                        type = type[8:]
                     # Create input image first.
                     gen_conversion_cmds(type)
                     localdata.setVar('type', type)
@@ -406,7 +408,7 @@ python () {
             gen_conversion_cmds(bt)
 
         localdata.setVar('type', realt)
-        if realt not in alltypes:
+        if t not in alltypes:
             rm_tmp_images.add(localdata.expand("${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"))
         else:
             subimages.append(realt)

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