summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorSong.Li <Song.Li@windriver.com>2013-02-22 18:52:19 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-22 06:09:19 -0800
commit4878b3ced8b901f060a5cc7b8a082698f6c2f0e8 (patch)
tree1ebefe6857f08252dc619e48440a2a025935c0ac /meta/classes/package.bbclass
parent406cb9920fad57a23d2139f657c41598eb5087bf (diff)
downloadpoky-4878b3ced8b901f060a5cc7b8a082698f6c2f0e8.tar.gz
pakcage.bbclass:use a better way to cut -dev/-dbg suffix
In pakcage.bbclass,function replace('-dev', '') is used to cut '-dev' suffix. but it will cause the name "lib32-device-dev" to "lib32ice", so change it to [:-4]. (From OE-Core rev: 91a3a48798029ca88a46a528200f4c5252f245e9) Signed-off-by: Song.Li <Song.Li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 77b3b4a219..b9ac0e6951 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1634,9 +1634,9 @@ python package_depchains() {
1634 #bb.note("Skipping %s" % depend) 1634 #bb.note("Skipping %s" % depend)
1635 continue 1635 continue
1636 if depend.endswith('-dev'): 1636 if depend.endswith('-dev'):
1637 depend = depend.replace('-dev', '') 1637 depend = depend[:-4]
1638 if depend.endswith('-dbg'): 1638 if depend.endswith('-dbg'):
1639 depend = depend.replace('-dbg', '') 1639 depend = depend[:-4]
1640 pkgname = getname(depend, suffix) 1640 pkgname = getname(depend, suffix)
1641 #bb.note("Adding %s for %s" % (pkgname, depend)) 1641 #bb.note("Adding %s for %s" % (pkgname, depend))
1642 if pkgname not in rreclist and pkgname != pkg: 1642 if pkgname not in rreclist and pkgname != pkg:
@@ -1655,9 +1655,9 @@ python package_depchains() {
1655 #bb.note("Skipping %s" % depend) 1655 #bb.note("Skipping %s" % depend)
1656 continue 1656 continue
1657 if depend.endswith('-dev'): 1657 if depend.endswith('-dev'):
1658 depend = depend.replace('-dev', '') 1658 depend = depend[:-4]
1659 if depend.endswith('-dbg'): 1659 if depend.endswith('-dbg'):
1660 depend = depend.replace('-dbg', '') 1660 depend = depend[:-4]
1661 pkgname = getname(depend, suffix) 1661 pkgname = getname(depend, suffix)
1662 #bb.note("Adding %s for %s" % (pkgname, depend)) 1662 #bb.note("Adding %s for %s" % (pkgname, depend))
1663 if pkgname not in rreclist and pkgname != pkg: 1663 if pkgname not in rreclist and pkgname != pkg: