diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-01-15 11:29:03 +0000 |
---|---|---|
committer | Joshua Lock <joshua.g.lock@intel.com> | 2016-01-15 11:29:03 +0000 |
commit | 12c7d3950f4dc3c69a954fa1236217b4c17a07f8 (patch) | |
tree | 622881ec0ce04c7382b5bd835e0d824b72117fec | |
parent | 4fa90207d8c86af27c8a351320493026ec8372c0 (diff) | |
download | openembedded-core-contrib-12c7d3950f4dc3c69a954fa1236217b4c17a07f8.tar.gz |
packagefeed-stability: work around a couple of issues
Possibly temporary workarounds to facilitate an initial build:
* Prevent do_package_compare being run for native packages (this is
a hammer to prevent trying to run build-compare on the
build-compare-native package)
* Prevent do_package_compare being run for recipes where PACKAGES
is empty (this was to prevent trying to run do_package_compare
on gcc-source, which has no packages)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
-rw-r--r-- | meta/classes/packagefeed-stability.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/packagefeed-stability.bbclass b/meta/classes/packagefeed-stability.bbclass index 18baee8613..e719b62c63 100644 --- a/meta/classes/packagefeed-stability.bbclass +++ b/meta/classes/packagefeed-stability.bbclass @@ -49,10 +49,15 @@ python() { d.appendVarFlag('do_build', 'recrdeptask', ' ' + pkgcomparefunc) - if d.getVarFlag(pkgwritefunc, 'noexec', True) or (not d.getVarFlag(pkgwritefunc, 'task', True)) or pkgwritefunc in (d.getVar('__BBDELTASKS', True) or []): + if d.getVarFlag(pkgwritefunc, 'noexec', True) or (not d.getVarFlag(pkgwritefunc, 'task', True)) or (not d.getVar('PACKAGES', True)) or pkgwritefunc in (d.getVar('__BBDELTASKS', True) or []): # Packaging is disabled for this recipe, we shouldn't do anything continue + if bb.data.inherits_class('native', d): + # Assume we don't care about native, if only to prevent a circular issue with + # trying to package_compare build-compare-native + continue + if deploydirvarref in sstate_outputdirs: # Set intermediate output directory d.setVarFlag(pkgwritefunc, 'sstate-outputdirs', sstate_outputdirs.replace(deploydirvarref, deploydirvarref + '-prediff')) |