[oe-commits] org.oe.dev base.bbclass, package.bbclass: don destrucively set RDEPENDS and RRECOMMENDS, from Poky

[koen commit]

base.bbclass, package.bbclass: don destrucively set RDEPENDS and RRECOMMENDS, from Poky
* poky rev 823: 'package.bbclass: depchains: don't -destructively- set the pkg's RRECOMMENDS.'
* poky rev 824: 'base.bbclass: depchains: don't -destructively- set the pkg's RRECOMMENDS.'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: a89f7dd0fbeeb4f5627838591cb356337a0b5ae2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a89f7dd0fbeeb4f5627838591cb356337a0b5ae2
Files:
1
classes/base.bbclass
classes/package.bbclass
Diffs:

#
# mt diff -rf36e897be3a017ed8398f173893a588a16daac07 -ra89f7dd0fbeeb4f5627838591cb356337a0b5ae2
#
# 
# 
# patch "classes/base.bbclass"
#  from [16a0be19e1ed6bb9aafdf7284f553981a3fa63da]
#    to [7add814371cb35cc2d894451f598ae7a5f221b98]
# 
# patch "classes/package.bbclass"
#  from [0cd495895bbdc33fbde2d2ff818bdc1a4b1f8369]
#    to [dd00fb7d5a6d81f95977010a17f22f2acc3fcf6a]
# 
============================================================
--- classes/base.bbclass	16a0be19e1ed6bb9aafdf7284f553981a3fa63da
+++ classes/base.bbclass	7add814371cb35cc2d894451f598ae7a5f221b98
@@ -616,6 +616,10 @@ def explode_deps(s):
 			r.append(i)
 	return r
 
+def packaged(pkg, d):
+	import os, bb
+	return os.access(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), os.R_OK)
+
 def read_pkgdatafile(fn):
 	pkgdata = {}
 
============================================================
--- classes/package.bbclass	0cd495895bbdc33fbde2d2ff818bdc1a4b1f8369
+++ classes/package.bbclass	dd00fb7d5a6d81f95977010a17f22f2acc3fcf6a
@@ -808,7 +808,7 @@ python package_depchains() {
 	def pkg_addrrecs(pkg, base, func, d):
 		rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + base, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or "")
 		# bb.note('rdepends for %s is %s' % (base, rdepends))
-		rreclist = []
+		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
 
 		for depend in rdepends:
 			split_depend = depend.split(' (')
@@ -824,8 +824,9 @@ python package_depchains() {
 		for postfix in postfixes:
 			def func(list, name):
 				pkg = '%s%s' % (name, postfix)
-				if packaged(pkg, d):
-					list.append(pkg)
+				if not pkg in list:
+					if packaged(pkg, d):
+						list.append(pkg)
 
 			base = pkg[:-len(postfix)]
 			if pkg.endswith(postfix):
@@ -835,8 +836,9 @@ python package_depchains() {
 		for prefix in prefixes:
 			def func(list, name):
 				pkg = '%s%s' % (prefix, name)
-				if packaged(pkg, d):
-					list.append(pkg)
+				if not pkg in list:
+					if packaged(pkg, d):
+						list.append(pkg)
 
 			base = pkg[len(prefix):]
 			if pkg.startswith(prefix):