mirror of
git://git.yoctoproject.org/poky
synced 2026-10-02 16:07:07 +00:00
package.bbclass: Avoid double suffix depchain packages
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3711 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
9f9ebe29be
commit
8dac31d678
@ -793,6 +793,10 @@ python package_depchains() {
|
|||||||
if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'):
|
if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'):
|
||||||
#bb.note("Skipping %s" % depend)
|
#bb.note("Skipping %s" % depend)
|
||||||
continue
|
continue
|
||||||
|
if depend.endswith('-dev'):
|
||||||
|
depend = depend.replace('-dev', '')
|
||||||
|
if depend.endswith('-dbg'):
|
||||||
|
depend = depend.replace('-dbg', '')
|
||||||
pkgname = getname(depend, suffix)
|
pkgname = getname(depend, suffix)
|
||||||
#bb.note("Adding %s for %s" % (pkgname, depend))
|
#bb.note("Adding %s for %s" % (pkgname, depend))
|
||||||
if not pkgname in rreclist:
|
if not pkgname in rreclist:
|
||||||
@ -807,6 +811,10 @@ python package_depchains() {
|
|||||||
rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
|
rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
|
||||||
|
|
||||||
for depend in rdepends:
|
for depend in rdepends:
|
||||||
|
if depend.endswith('-dev'):
|
||||||
|
depend = depend.replace('-dev', '')
|
||||||
|
if depend.endswith('-dbg'):
|
||||||
|
depend = depend.replace('-dbg', '')
|
||||||
pkgname = getname(depend, suffix)
|
pkgname = getname(depend, suffix)
|
||||||
if not pkgname in rreclist:
|
if not pkgname in rreclist:
|
||||||
rreclist.append(pkgname)
|
rreclist.append(pkgname)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user