diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-04-08 17:18:44 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-08 18:02:41 +0100 |
| commit | 84a1c6922934a99e8afee0185e58dc4789b54a22 (patch) | |
| tree | 7d3d2c184efffc2bba8e882173f96adaf13eac24 | |
| parent | 99194be0332ac35da729ec53a2cc423cc520db28 (diff) | |
| download | openembedded-core-84a1c6922934a99e8afee0185e58dc4789b54a22.tar.gz openembedded-core-84a1c6922934a99e8afee0185e58dc4789b54a22.tar.bz2 openembedded-core-84a1c6922934a99e8afee0185e58dc4789b54a22.zip | |
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@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | 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 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: |