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>
This commit is contained in:
parent
90d38aba77
commit
61dfb80173
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue