diff options
| author |   Chris Larson <kergoth@openedhand.com> | 2006-10-27 19:25:05 +0000 |
|---|---|---|
| committer | Chris Larson <kergoth@openedhand.com> | 2006-10-27 19:25:05 +0000 |
| commit | d726bba0e0cf415fcf908e38b2335ff68b6f8f61 (patch) | |
| tree | a9d4e295808ac089be9792dd342da094056028fc /meta | |
| parent | 002f491523ed778f756367e5f27e13eac7c6fd6a (diff) | |
| download | openembedded-core-contrib-d726bba0e0cf415fcf908e38b2335ff68b6f8f61.tar.gz | |
package.bbclass: depchains: don't -destructively- set the pkg's RRECOMMENDS.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@823 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/package.bbclass | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 44db26ffbc..d56e8b51f8 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -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): |