From: Joshua Watt Date: Wed, 20 Dec 2023 18:01:02 +0000 (-0700) Subject: lib/packagedata.py: Fix broken symlinks for providers with a '/' X-Git-Tag: uninative-4.4~641 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b1482a4e2adb7cf358d638265cf116b34078b84;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git lib/packagedata.py: Fix broken symlinks for providers with a '/' If a package had a provider with a '/' in it (e.g. "/bin/sh", "/bin/bash", etc.), the generated symlinks were broken due to being at a hard coded depth. Use oe.path.relsymlink() instead to make a correct relative symbolic link Signed-off-by: Joshua Watt Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py index 162ff60d72f..d59f6f5a569 100644 --- a/meta/lib/oe/packagedata.py +++ b/meta/lib/oe/packagedata.py @@ -317,7 +317,7 @@ fi for p in bb.utils.explode_deps(rprov): subdata_sym = pkgdatadir + "/runtime-rprovides/%s/%s" % (p, pkg) bb.utils.mkdirhier(os.path.dirname(subdata_sym)) - oe.path.symlink("../../runtime/%s" % pkg, subdata_sym, True) + oe.path.relsymlink(subdata_file, subdata_sym, True) allow_empty = d.getVar('ALLOW_EMPTY:%s' % pkg) if not allow_empty: @@ -328,7 +328,7 @@ fi if g or allow_empty == "1": # Symlinks needed for reverse lookups (from the final package name) subdata_sym = pkgdatadir + "/runtime-reverse/%s" % pkgval - oe.path.symlink("../runtime/%s" % pkg, subdata_sym, True) + oe.path.relsymlink(subdata_file, subdata_sym, True) packagedfile = pkgdatadir + '/runtime/%s.packaged' % pkg open(packagedfile, 'w').close()