From ccfc13adedd97f57024420639053080e047529dc Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sun, 17 Jul 2016 20:32:48 -0700 Subject: packagefeed-stability.bbclass: minor fixes * fix for python3 iteritems() -> items() * Return immediately for native and cross. * Remove the usage of __BBDELTASKS, there is no such var in bitbake. Signed-off-by: Robert Yang Signed-off-by: Ross Burton --- meta/classes/packagefeed-stability.bbclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/classes/packagefeed-stability.bbclass b/meta/classes/packagefeed-stability.bbclass index b5207d9f84..808a18f93a 100644 --- a/meta/classes/packagefeed-stability.bbclass +++ b/meta/classes/packagefeed-stability.bbclass @@ -25,6 +25,8 @@ # package files so they will definitely be copied the next time. python() { + if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d): + return # Package backend agnostic intercept # This assumes that the package_write task is called package_write_ # and that the directory in which packages should be written is @@ -49,7 +51,7 @@ 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): # Packaging is disabled for this recipe, we shouldn't do anything continue @@ -118,7 +120,7 @@ def package_compare_impl(pkgtype, d): # Prepare a list of the runtime package names for packages that were # actually produced rpkglist = [] - for pkg, rpkg in rpkgnames.iteritems(): + for pkg, rpkg in rpkgnames.items(): if os.path.exists(os.path.join(pkgdatadir, 'runtime', pkg + '.packaged')): rpkglist.append((rpkg, pkg)) rpkglist.sort(key=lambda x: len(x[0]), reverse=True) @@ -187,7 +189,7 @@ def package_compare_impl(pkgtype, d): if not rdeps: continue rdepvers = bb.utils.explode_dep_versions2(rdeps) - for rdep, versions in rdepvers.iteritems(): + for rdep, versions in rdepvers.items(): dep = rpkgdict.get(rdep, None) for version in versions: if version and version.startswith('= '): -- cgit 1.2.3-korg