From b67dce7ed011eebabc81eca7a6be5a5afc924cfb Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 31 Oct 2024 11:40:17 +0000 Subject: lib/oe/package: remove PACKAGE_SNAP_LIB_SYMLINKS This was added to OpenEmbedded in 2011[1] for the micro distro[2] and subsequently ported to oe-core[3]. This feature aims to improve runtime link speed by removing intermediate symlinks, i.e. libstdc++.so.6 is not a symlink but the actual library. However, there are several issues here: - The meta-micro distribution has been unmaintained since 2012[4] - The original creator of this function has confirmed that it is not in use anymore because the renaming doesn't affect the -dev packages, so on-target development or use of SDKs isn't possible. Whilst the latter is possible to fix, the performance impact of removing a single symlink resolution is negliable at best and the packaging code is already very complex. So, remove this functionality as it is known to be broken, isn't tested, and removing it reduces complexity. [1] https://git.openembedded.org/openembedded/commit/?id=cf7114179ead8ddff8f66e84d630811920ac9add [2] https://git.openembedded.org/openembedded/tree/conf/distro/micro.conf [3] https://git.openembedded.org/openembedded-core/commit/?id=600dbb7cb384c2290af38b993a9bea3a4dfc4494 [4] https://git.openembedded.org/meta-micro/ (From OE-Core rev: 9bfdf4c9eff16804588942a13ac7484059197f99) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oe/package.py | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'meta/lib/oe') diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index 16359232ec..1af10b7eb0 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -1623,7 +1623,6 @@ def process_shlibs(pkgfiles, d): needs_ldconfig = False needed = set() sonames = set() - renames = [] ldir = os.path.dirname(file).replace(pkgdest + "/" + pkg, '') cmd = d.getVar('OBJDUMP') + " -p " + shlex.quote(file) + " 2>/dev/null" fd = os.popen(cmd) @@ -1651,11 +1650,9 @@ def process_shlibs(pkgfiles, d): sonames.add(prov) if libdir_re.match(os.path.dirname(file)): needs_ldconfig = True - if needs_ldconfig and snap_symlinks and (os.path.basename(file) != this_soname): - renames.append((file, os.path.join(os.path.dirname(file), this_soname))) - return (needs_ldconfig, needed, sonames, renames) + return (needs_ldconfig, needed, sonames) - def darwin_so(file, needed, sonames, renames, pkgver): + def darwin_so(file, needed, sonames, pkgver): if not os.path.exists(file): return ldir = os.path.dirname(file).replace(pkgdest + "/" + pkg, '') @@ -1707,7 +1704,7 @@ def process_shlibs(pkgfiles, d): if name and name not in needed[pkg]: needed[pkg].add((name, file, tuple())) - def mingw_dll(file, needed, sonames, renames, pkgver): + def mingw_dll(file, needed, sonames, pkgver): if not os.path.exists(file): return @@ -1726,11 +1723,6 @@ def process_shlibs(pkgfiles, d): if dllname: needed[pkg].add((dllname, file, tuple())) - if d.getVar('PACKAGE_SNAP_LIB_SYMLINKS') == "1": - snap_symlinks = True - else: - snap_symlinks = False - needed = {} shlib_provider = oe.package.read_shlib_providers(d) @@ -1749,16 +1741,15 @@ def process_shlibs(pkgfiles, d): needed[pkg] = set() sonames = set() - renames = [] linuxlist = [] for file in pkgfiles[pkg]: soname = None if cpath.islink(file): continue if hostos.startswith("darwin"): - darwin_so(file, needed, sonames, renames, pkgver) + darwin_so(file, needed, sonames, pkgver) elif hostos.startswith("mingw"): - mingw_dll(file, needed, sonames, renames, pkgver) + mingw_dll(file, needed, sonames, pkgver) elif os.access(file, os.X_OK) or lib_re.match(file): linuxlist.append(file) @@ -1768,14 +1759,8 @@ def process_shlibs(pkgfiles, d): ldconfig = r[0] needed[pkg] |= r[1] sonames |= r[2] - renames.extend(r[3]) needs_ldconfig = needs_ldconfig or ldconfig - for (old, new) in renames: - bb.note("Renaming %s to %s" % (old, new)) - bb.utils.rename(old, new) - pkgfiles[pkg].remove(old) - shlibs_file = os.path.join(shlibswork_dir, pkg + ".list") if len(sonames): with open(shlibs_file, 'w') as fd: -- cgit v1.2.3-54-g00ecf