summaryrefslogtreecommitdiffstats
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
parent90d38aba77d3790dde731a7b18474168da416986 (diff)
downloadpoky-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>
-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 900c27af68..629b2d5c84 100755
--- a/scripts/oe-pkgdata-util
+++ b/scripts/oe-pkgdata-util
@@ -115,14 +115,21 @@ def glob(args):
115 if not os.path.exists(fwdfile + ".packaged"): 115 if not os.path.exists(fwdfile + ".packaged"):
116 mappedpkg = "" 116 mappedpkg = ""
117 else: 117 else:
118 # That didn't work, so now get the PN, substitute that, then map in the other direction
119 revlink = revpkgdata(pkg) 118 revlink = revpkgdata(pkg)
120 if os.path.exists(revlink): 119 if os.path.exists(revlink):
121 pn = readpn(revlink) 120 # Check if we can map after undoing the package renaming (by resolving the symlink)
122 newpkg = g.replace("*", pn) 121 origpkg = os.path.basename(os.readlink(revlink))
122 newpkg = g.replace("*", origpkg)
123 fwdfile = fwdpkgdata(newpkg) 123 fwdfile = fwdpkgdata(newpkg)
124 if os.path.exists(fwdfile): 124 if os.path.exists(fwdfile):
125 mappedpkg = readrenamed(fwdfile) 125 mappedpkg = readrenamed(fwdfile)
126 else:
127 # That didn't work, so now get the PN, substitute that, then map in the other direction
128 pn = readpn(revlink)
129 newpkg = g.replace("*", pn)
130 fwdfile = fwdpkgdata(newpkg)
131 if os.path.exists(fwdfile):
132 mappedpkg = readrenamed(fwdfile)
126 if not os.path.exists(fwdfile + ".packaged"): 133 if not os.path.exists(fwdfile + ".packaged"):
127 mappedpkg = "" 134 mappedpkg = ""
128 else: 135 else: