aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/oe-pkgdata-util
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-04-08 17:18:44 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-08 18:02:47 +0100
commit61dfb80173f66eceab0d3bf31ffbc1fbfd4d3b51 (patch)
treef71504df437979e198490e7471d95dbfac886732 /scripts/oe-pkgdata-util
parent90d38aba77d3790dde731a7b18474168da416986 (diff)
downloadopenembedded-core-contrib-61dfb80173f66eceab0d3bf31ffbc1fbfd4d3b51.tar.gz
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 <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/oe-pkgdata-util')
-rwxr-xr-xscripts/oe-pkgdata-util13
1 files changed, 10 insertions, 3 deletions
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util
index 900c27af68f..629b2d5c844 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: