aboutsummaryrefslogtreecommitdiffstats
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 05:52:25 -0800
commit91a3a48798029ca88a46a528200f4c5252f245e9 (patch)
tree3e2d055c9d11273958d9463675b488f255b7dcf8
parenta5362de60c0051f16b88a40bd9cb41915bee0b0f (diff)
downloadopenembedded-core-contrib-91a3a48798029ca88a46a528200f4c5252f245e9.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]. Signed-off-by: Song.Li <Song.Li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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() {
#bb.note("Skipping %s" % depend)
continue
if depend.endswith('-dev'):
- depend = depend.replace('-dev', '')
+ depend = depend[:-4]
if depend.endswith('-dbg'):
- depend = depend.replace('-dbg', '')
+ depend = depend[:-4]
pkgname = getname(depend, suffix)
#bb.note("Adding %s for %s" % (pkgname, depend))
if pkgname not in rreclist and pkgname != pkg:
@@ -1655,9 +1655,9 @@ python package_depchains() {
#bb.note("Skipping %s" % depend)
continue
if depend.endswith('-dev'):
- depend = depend.replace('-dev', '')
+ depend = depend[:-4]
if depend.endswith('-dbg'):
- depend = depend.replace('-dbg', '')
+ depend = depend[:-4]
pkgname = getname(depend, suffix)
#bb.note("Adding %s for %s" % (pkgname, depend))
if pkgname not in rreclist and pkgname != pkg: