summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-05-07 14:52:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-07 14:59:15 +0100
commit440029dc229a566b9bead1481215d5e5760c5fe6 (patch)
tree9107d500250873adedfa277d9e5e3454de28ebd2
parentf9bad5aeb507f5b3c1346118011c7766c44d9ba4 (diff)
downloadopenembedded-core-contrib-440029dc229a566b9bead1481215d5e5760c5fe6.tar.gz
openembedded-core-contrib-440029dc229a566b9bead1481215d5e5760c5fe6.tar.bz2
openembedded-core-contrib-440029dc229a566b9bead1481215d5e5760c5fe6.zip
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]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/devtool.py10
-rw-r--r--scripts/lib/devtool/standard.py2
2 files changed, 10 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index 2af6114948..2344fac5d8 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -325,7 +325,15 @@ class DevtoolTests(oeSelfTest):
self.track_for_cleanup(workspacedir)
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:
# Check it's a valid recipe
bitbake('%s -e' % testrecipe)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index cb4b57be92..81a44d4513 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -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")
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)
return False