devtool: fix for rename of gcc-source

After OE-Core commit 67db7182faf6742b0d971d61d8c5ba34f69d2e12, PV is
appended to the end of the gcc-source PN, thus we need to handle that in
devtool and the corresponding test.

Part of the fix for [YOCTO #7729].

(From OE-Core rev: 440029dc229a566b9bead1481215d5e5760c5fe6)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2015-05-07 14:52:24 +01:00 committed by Richard Purdie
parent b7cff751fd
commit 1f15117404
2 changed files with 10 additions and 2 deletions

View File

@ -325,7 +325,15 @@ class DevtoolTests(oeSelfTest):
self.track_for_cleanup(workspacedir) self.track_for_cleanup(workspacedir)
self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
testrecipes = 'perf gcc-source kernel-devsrc package-index core-image-minimal meta-toolchain packagegroup-core-sdk meta-ide-support'.split() testrecipes = 'perf kernel-devsrc package-index core-image-minimal meta-toolchain packagegroup-core-sdk meta-ide-support'.split()
# Find actual name of gcc-source since it now includes the version - crude, but good enough for this purpose
result = runCmd('bitbake-layers show-recipes gcc-source*')
reading = False
for line in result.output.splitlines():
if line.startswith('=='):
reading = True
elif reading and not line.startswith(' '):
testrecipes.append(line.split(':')[0])
for testrecipe in testrecipes: for testrecipe in testrecipes:
# Check it's a valid recipe # Check it's a valid recipe
bitbake('%s -e' % testrecipe) bitbake('%s -e' % testrecipe)

View File

@ -124,7 +124,7 @@ def _check_compatible_recipe(pn, d):
logger.error("The perf recipe does not actually check out source and thus cannot be supported by this tool") logger.error("The perf recipe does not actually check out source and thus cannot be supported by this tool")
return False return False
if pn in ['gcc-source', 'kernel-devsrc', 'package-index']: if pn in ['kernel-devsrc', 'package-index'] or pn.startswith('gcc-source'):
logger.error("The %s recipe is not supported by this tool" % pn) logger.error("The %s recipe is not supported by this tool" % pn)
return False return False