From 61dfb80173f66eceab0d3bf31ffbc1fbfd4d3b51 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 8 Apr 2013 17:18:44 +0100 Subject: 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]. (From OE-Core rev: 84a1c6922934a99e8afee0185e58dc4789b54a22) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/oe-pkgdata-util | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'scripts/oe-pkgdata-util') diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index 900c27af68..629b2d5c84 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: -- cgit v1.2.3-54-g00ecf