summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-02-07 20:20:34 +0000
committerRichard Purdie <richard@openedhand.com>2008-02-07 20:20:34 +0000
commit8dac31d67803c59d950a02b5ce3a638731b86cdc (patch)
treec8aa9948964cedf54c86b54b056eeac687c51c07 /meta/classes
parent9f9ebe29be61ef497c47b4e0f7898618424f11b8 (diff)
downloadpoky-8dac31d67803c59d950a02b5ce3a638731b86cdc.tar.gz
package.bbclass: Avoid double suffix depchain packages
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3711 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package.bbclass8
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index cc06dec813..55d9684683 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -793,6 +793,10 @@ python package_depchains() {
793 if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'): 793 if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'):
794 #bb.note("Skipping %s" % depend) 794 #bb.note("Skipping %s" % depend)
795 continue 795 continue
796 if depend.endswith('-dev'):
797 depend = depend.replace('-dev', '')
798 if depend.endswith('-dbg'):
799 depend = depend.replace('-dbg', '')
796 pkgname = getname(depend, suffix) 800 pkgname = getname(depend, suffix)
797 #bb.note("Adding %s for %s" % (pkgname, depend)) 801 #bb.note("Adding %s for %s" % (pkgname, depend))
798 if not pkgname in rreclist: 802 if not pkgname in rreclist:
@@ -807,6 +811,10 @@ python package_depchains() {
807 rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "") 811 rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
808 812
809 for depend in rdepends: 813 for depend in rdepends:
814 if depend.endswith('-dev'):
815 depend = depend.replace('-dev', '')
816 if depend.endswith('-dbg'):
817 depend = depend.replace('-dbg', '')
810 pkgname = getname(depend, suffix) 818 pkgname = getname(depend, suffix)
811 if not pkgname in rreclist: 819 if not pkgname in rreclist:
812 rreclist.append(pkgname) 820 rreclist.append(pkgname)