summaryrefslogtreecommitdiffstats
path: root/meta/classes/image.bbclass
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2016-04-19 10:01:11 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-19 21:11:25 +0100
commit98558405bf17532faa35f15c3b0ab73c42134fd4 (patch)
treeb25c8cbed25429337f36a5844b91160be5bfe57c /meta/classes/image.bbclass
parent38c7e2d0693f2a1ab2ce6d858b63e5c7d74907ed (diff)
downloadpoky-98558405bf17532faa35f15c3b0ab73c42134fd4.tar.gz
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" (From OE-Core rev: ca088bebfc3603ef206b20501916019f0572f955) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r--meta/classes/image.bbclass4
1 files changed, 3 insertions, 1 deletions
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 () {
393 for ctype in ctypes: 393 for ctype in ctypes:
394 if bt.endswith("." + ctype): 394 if bt.endswith("." + ctype):
395 type = bt[0:-len(ctype) - 1] 395 type = bt[0:-len(ctype) - 1]
396 if type.startswith("debugfs_"):
397 type = type[8:]
396 # Create input image first. 398 # Create input image first.
397 gen_conversion_cmds(type) 399 gen_conversion_cmds(type)
398 localdata.setVar('type', type) 400 localdata.setVar('type', type)
@@ -406,7 +408,7 @@ python () {
406 gen_conversion_cmds(bt) 408 gen_conversion_cmds(bt)
407 409
408 localdata.setVar('type', realt) 410 localdata.setVar('type', realt)
409 if realt not in alltypes: 411 if t not in alltypes:
410 rm_tmp_images.add(localdata.expand("${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}")) 412 rm_tmp_images.add(localdata.expand("${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"))
411 else: 413 else:
412 subimages.append(realt) 414 subimages.append(realt)