[oe-commits] Paul Eggleton : scripts/oe-pkgdata-util: find complementary packages for split packages
git at git.openembedded.org
git at git.openembedded.org
Mon Apr 8 16:59:59 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: 84a1c6922934a99e8afee0185e58dc4789b54a22
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=84a1c6922934a99e8afee0185e58dc4789b54a22
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Mon Apr 8 17:18:44 2013 +0100
scripts/oe-pkgdata-util: find complementary packages for split packages
Check after getting the original package name (e.g. undoing Debian
renaming) if there is a complementary package for that name, e.g. if
the glob is *-dev, then libudev0 -> libudev -> libudev-dev.
Fixes [YOCTO #4136].
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
scripts/oe-pkgdata-util | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util
index 900c27a..629b2d5 100755
--- a/scripts/oe-pkgdata-util
+++ b/scripts/oe-pkgdata-util
@@ -115,14 +115,21 @@ def glob(args):
if not os.path.exists(fwdfile + ".packaged"):
mappedpkg = ""
else:
- # That didn't work, so now get the PN, substitute that, then map in the other direction
revlink = revpkgdata(pkg)
if os.path.exists(revlink):
- pn = readpn(revlink)
- newpkg = g.replace("*", pn)
+ # Check if we can map after undoing the package renaming (by resolving the symlink)
+ origpkg = os.path.basename(os.readlink(revlink))
+ newpkg = g.replace("*", origpkg)
fwdfile = fwdpkgdata(newpkg)
if os.path.exists(fwdfile):
mappedpkg = readrenamed(fwdfile)
+ else:
+ # That didn't work, so now get the PN, substitute that, then map in the other direction
+ pn = readpn(revlink)
+ newpkg = g.replace("*", pn)
+ fwdfile = fwdpkgdata(newpkg)
+ if os.path.exists(fwdfile):
+ mappedpkg = readrenamed(fwdfile)
if not os.path.exists(fwdfile + ".packaged"):
mappedpkg = ""
else:
More information about the Openembedded-commits
mailing list