diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-17 22:25:20 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-19 16:35:38 +0000 |
| commit | e609a4dea2f6d9744e7d2a6650bebf2c02398907 (patch) | |
| tree | c832db01c1f5c99b08edef2422234d89c25fb533 /meta | |
| parent | 3e53e675bba75eb949be97a8d372e0134f6df935 (diff) | |
| download | openembedded-core-contrib-e609a4dea2f6d9744e7d2a6650bebf2c02398907.tar.gz | |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/image.bbclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 83ba5c35f0b..387051654ee 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) } |