diff options
| -rw-r--r-- | meta/classes/meta.bbclass | 4 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 2 | ||||
| -rw-r--r-- | scripts/lib/devtool/standard.py | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/meta/classes/meta.bbclass b/meta/classes/meta.bbclass deleted file mode 100644 index 5e6890238b..0000000000 --- a/meta/classes/meta.bbclass +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | |||
| 2 | PACKAGES = "" | ||
| 3 | |||
| 4 | do_build[recrdeptask] = "do_build" | ||
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 6d9cd46bf3..f495e84c79 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
| @@ -649,7 +649,7 @@ class DevtoolModifyTests(DevtoolBase): | |||
| 649 | self.track_for_cleanup(self.workspacedir) | 649 | self.track_for_cleanup(self.workspacedir) |
| 650 | self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') | 650 | self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') |
| 651 | 651 | ||
| 652 | testrecipes = 'perf kernel-devsrc package-index core-image-minimal meta-toolchain packagegroup-core-sdk meta-ide-support'.split() | 652 | testrecipes = 'perf kernel-devsrc package-index core-image-minimal meta-toolchain packagegroup-core-sdk'.split() |
| 653 | # Find actual name of gcc-source since it now includes the version - crude, but good enough for this purpose | 653 | # Find actual name of gcc-source since it now includes the version - crude, but good enough for this purpose |
| 654 | result = runCmd('bitbake-layers show-recipes gcc-source*') | 654 | result = runCmd('bitbake-layers show-recipes gcc-source*') |
| 655 | for line in result.output.splitlines(): | 655 | for line in result.output.splitlines(): |
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index b74a60d001..01fb5ad96f 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
| @@ -318,10 +318,6 @@ def _check_compatible_recipe(pn, d): | |||
| 318 | raise DevtoolError("The %s recipe is a packagegroup, and therefore is " | 318 | raise DevtoolError("The %s recipe is a packagegroup, and therefore is " |
| 319 | "not supported by this tool" % pn, 4) | 319 | "not supported by this tool" % pn, 4) |
| 320 | 320 | ||
| 321 | if bb.data.inherits_class('meta', d): | ||
| 322 | raise DevtoolError("The %s recipe is a meta-recipe, and therefore is " | ||
| 323 | "not supported by this tool" % pn, 4) | ||
| 324 | |||
| 325 | if bb.data.inherits_class('externalsrc', d) and d.getVar('EXTERNALSRC'): | 321 | if bb.data.inherits_class('externalsrc', d) and d.getVar('EXTERNALSRC'): |
| 326 | # Not an incompatibility error per se, so we don't pass the error code | 322 | # Not an incompatibility error per se, so we don't pass the error code |
| 327 | raise DevtoolError("externalsrc is currently enabled for the %s " | 323 | raise DevtoolError("externalsrc is currently enabled for the %s " |
