summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-07-17 20:32:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-26 08:56:29 +0100
commit600f0b3e04fc97640a935edfd14900c06a99d2ab (patch)
tree34029303efd31d08bff03c41df7dc903e0162c66 /meta/classes
parentb36753b1c9c5471ccc43735957248f2a5bb76aba (diff)
downloadpoky-600f0b3e04fc97640a935edfd14900c06a99d2ab.tar.gz
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. (From OE-Core rev: ccfc13adedd97f57024420639053080e047529dc) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/packagefeed-stability.bbclass8
1 files 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 @@
25# package files so they will definitely be copied the next time. 25# package files so they will definitely be copied the next time.
26 26
27python() { 27python() {
28 if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d):
29 return
28 # Package backend agnostic intercept 30 # Package backend agnostic intercept
29 # This assumes that the package_write task is called package_write_<pkgtype> 31 # This assumes that the package_write task is called package_write_<pkgtype>
30 # and that the directory in which packages should be written is 32 # and that the directory in which packages should be written is
@@ -49,7 +51,7 @@ python() {
49 51
50 d.appendVarFlag('do_build', 'recrdeptask', ' ' + pkgcomparefunc) 52 d.appendVarFlag('do_build', 'recrdeptask', ' ' + pkgcomparefunc)
51 53
52 if d.getVarFlag(pkgwritefunc, 'noexec', True) or (not d.getVarFlag(pkgwritefunc, 'task', True)) or pkgwritefunc in (d.getVar('__BBDELTASKS', True) or []): 54 if d.getVarFlag(pkgwritefunc, 'noexec', True) or not d.getVarFlag(pkgwritefunc, 'task', True):
53 # Packaging is disabled for this recipe, we shouldn't do anything 55 # Packaging is disabled for this recipe, we shouldn't do anything
54 continue 56 continue
55 57
@@ -118,7 +120,7 @@ def package_compare_impl(pkgtype, d):
118 # Prepare a list of the runtime package names for packages that were 120 # Prepare a list of the runtime package names for packages that were
119 # actually produced 121 # actually produced
120 rpkglist = [] 122 rpkglist = []
121 for pkg, rpkg in rpkgnames.iteritems(): 123 for pkg, rpkg in rpkgnames.items():
122 if os.path.exists(os.path.join(pkgdatadir, 'runtime', pkg + '.packaged')): 124 if os.path.exists(os.path.join(pkgdatadir, 'runtime', pkg + '.packaged')):
123 rpkglist.append((rpkg, pkg)) 125 rpkglist.append((rpkg, pkg))
124 rpkglist.sort(key=lambda x: len(x[0]), reverse=True) 126 rpkglist.sort(key=lambda x: len(x[0]), reverse=True)
@@ -187,7 +189,7 @@ def package_compare_impl(pkgtype, d):
187 if not rdeps: 189 if not rdeps:
188 continue 190 continue
189 rdepvers = bb.utils.explode_dep_versions2(rdeps) 191 rdepvers = bb.utils.explode_dep_versions2(rdeps)
190 for rdep, versions in rdepvers.iteritems(): 192 for rdep, versions in rdepvers.items():
191 dep = rpkgdict.get(rdep, None) 193 dep = rpkgdict.get(rdep, None)
192 for version in versions: 194 for version in versions:
193 if version and version.startswith('= '): 195 if version and version.startswith('= '):