From e609a4dea2f6d9744e7d2a6650bebf2c02398907 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 17 Jan 2016 22:25:20 +0000 Subject: image: Handle image types containing '-' correctly Shell function names can't contain '-' characters, which means our image task names also can't. Add some mapping to use '_' instead of the '-' so images like "rpi-sdimg" work again. Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 83ba5c35f0..387051654e 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -393,6 +393,12 @@ python () { else: subimages.append(realt) + after = 'do_image' + for dep in typedeps[t]: + after += ' do_image_%s' % dep.replace("-", "_") + + t = t.replace("-", "_") + d.setVar('do_image_%s' % t, '\n'.join(cmds)) d.setVarFlag('do_image_%s' % t, 'func', '1') d.setVarFlag('do_image_%s' % t, 'fakeroot', '1') @@ -402,10 +408,6 @@ python () { d.appendVarFlag('do_image_%s' % t, 'vardeps', ' '.join(vardeps)) d.appendVarFlag('do_image_%s' % t, 'vardepsexclude', 'DATETIME') - after = 'do_image' - for dep in typedeps[t]: - after += ' do_image_%s' % dep - bb.debug(2, "Adding type %s before %s, after %s" % (t, 'do_image_complete', after)) bb.build.addtask('do_image_%s' % t, 'do_image_complete', after, d) } -- cgit 1.2.3-korg