From ca088bebfc3603ef206b20501916019f0572f955 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 19 Apr 2016 10:01:11 -0500 Subject: 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 Signed-off-by: Richard Purdie --- 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 f471f1a132..8bfd24193e 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) -- cgit 1.2.3-korg