mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

mklibs: remove recipes and class

Browse Source 
This is not enabled or tested by default, and has never been
ported to python 3 upstream[1], which means it doesn't work at all
with plain poky. If you need it, please put it in a separate layer
and/or modernize to work with py3.

https://salsa.debian.org/installer-team/mklibs/-/blob/master/src/mklibs

(From OE-Core rev: 908df863b419d1cad7317153101fc827e7e3a354)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2021-05-18 08:24:46 +02:00
committed by Richard Purdie
parent c879b0797b
commit e897e02d21
9 changed files with 0 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
meta/classes/image-mklibs.bbclass
View File

@@ -1,56 +0,0 @@
do_rootfs[depends] += "mklibs-native:do_populate_sysroot"
IMAGE_PREPROCESS_COMMAND += "mklibs_optimize_image; "
inherit linuxloader
mklibs_optimize_image_doit() {
rm -rf ${WORKDIR}/mklibs
mkdir -p ${WORKDIR}/mklibs/dest
cd ${IMAGE_ROOTFS}
du -bs > ${WORKDIR}/mklibs/du.before.mklibs.txt
# Build a list of dynamically linked executable ELF files.
# Omit libc/libpthread as a special case because it has an interpreter
# but is primarily what we intend to strip down.
for i in `find . -type f -executable ! -name 'libc-*' ! -name 'libpthread-*'`; do
file $i | grep -q ELF || continue
${HOST_PREFIX}readelf -l $i | grep -q INTERP || continue
echo $i
done > ${WORKDIR}/mklibs/executables.list
dynamic_loader=${@get_linuxloader(d)}
mklibs -v \
--ldlib ${dynamic_loader} \
--libdir ${baselib} \
--sysroot ${PKG_CONFIG_SYSROOT_DIR} \
--gcc-options "--sysroot=${PKG_CONFIG_SYSROOT_DIR}" \
--root ${IMAGE_ROOTFS} \
--target `echo ${TARGET_PREFIX} | sed 's/-$//' ` \
-d ${WORKDIR}/mklibs/dest \
`cat ${WORKDIR}/mklibs/executables.list`
cd ${WORKDIR}/mklibs/dest
for i in *
do
cp $i `find ${IMAGE_ROOTFS} -name $i`
done
cd ${IMAGE_ROOTFS}
du -bs > ${WORKDIR}/mklibs/du.after.mklibs.txt
echo rootfs size before mklibs optimization: `cat ${WORKDIR}/mklibs/du.before.mklibs.txt`
echo rootfs size after mklibs optimization: `cat ${WORKDIR}/mklibs/du.after.mklibs.txt`
}
mklibs_optimize_image() {
for img in ${MKLIBS_OPTIMIZED_IMAGES}
do
if [ "${img}" = "${PN}" ] || [ "${img}" = "all" ]
then
mklibs_optimize_image_doit
break
fi
done
}

1
meta/conf/distro/include/maintainers.inc
View File

@@ -508,7 +508,6 @@ RECIPE_MAINTAINER_pn-mingetty = "Yi Zhao <yi.zhao@windriver.com>"
RECIPE_MAINTAINER_pn-mini-x-session = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-minicom = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER_pn-mkfontscale = "Armin Kuster <akuster808@gmail.com>"
RECIPE_MAINTAINER_pn-mklibs-native = "Robert Yang <liezhi.yang@windriver.com>"
RECIPE_MAINTAINER_pn-mmc-utils = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER_pn-mobile-broadband-provider-info = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-modutils-initscripts = "Yi Zhao <yi.zhao@windriver.com>"

19
meta/recipes-devtools/mklibs/files/ac_init_fix.patch
View File

@@ -1,19 +0,0 @@
Get the version of mklibs by simpler means. The MKLIBS_VERSION string in the
configure.ac file is replaced with real version string by the
do_configure_prepend() function from the recipe .bb file.
Upstream-Status: Inappropriate [configuration]
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/24
Index: mklibs/configure.ac
===================================================================
--- mklibs.orig/configure.ac 2010-02-21 17:34:56.000000000 -0800
+++ mklibs/configure.ac 2011-01-24 18:52:19.943242079 -0800
@@ -1,4 +1,4 @@
-AC_INIT([mklibs],m4_esyscmd(dpkg-parsechangelog | perl -ne 'print $1 if m/^Version: (.*)$/;'))
+AC_INIT([mklibs], MKLIBS_VERSION)
AM_INIT_AUTOMAKE([foreign no-define])
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE

103
meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
View File

@@ -1,103 +0,0 @@
From dcb45256970b15b672d0004533826c94083356e5 Mon Sep 17 00:00:00 2001
From: Yuanjie Huang <yuanjie.huang@windriver.com>
Date: Fri, 17 Apr 2015 14:48:20 +0800
Subject: [PATCH 4/6] avoid failure on symbol provided by application
Upstream-Status: Pending
Undefined symbols in a library can be provided by the application
that links to the library, such as `logsink' in libmultipath.so.0.
This fix checks the type of object in which the symbol is needed
and the existence of the symbol in application, when a symbol
cannot be provided by libraries. It prevents false alarm on absence
of symbols.
Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
---
src/mklibs | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/mklibs b/src/mklibs
index a3533c0..66b7a09 100755
--- a/src/mklibs
+++ b/src/mklibs
@@ -133,9 +133,9 @@ class Symbol(object):
return '@'.join(ret)
class UndefinedSymbol(Symbol):
- def __init__(self, name, weak, version, library):
+ def __init__(self, name, weak, version, library, object):
super(UndefinedSymbol, self).__init__(name, version, library)
- self.weak, self.library = weak, library
+ self.weak, self.library, self.object = weak, library, object
def symbol_is_blacklisted(name):
# The ARM Embedded ABI spec states symbols under this namespace as
@@ -152,6 +152,11 @@ def undefined_symbols(obj):
output = command("mklibs-readelf", "--print-symbols-undefined", obj)
+ if len(obj) > len(dest_path) and obj[:len(dest_path)] == dest_path:
+ object = obj[len(dest_path) + 1:-len('-so-stripped')]
+ else:
+ object = obj
+
result = []
for line in output:
name, weak_string, version_string, library_string = line.split()[:4]
@@ -171,7 +176,7 @@ def undefined_symbols(obj):
if library_string.lower() != 'none':
library = library_string
- result.append(UndefinedSymbol(name, weak, version, library))
+ result.append(UndefinedSymbol(name, weak, version, library, object))
return result
@@ -498,12 +503,13 @@ while 1:
and re.search("^ps_", str(symbol)))
and not (re.search("ld-linux.so.3$", str(symbol)))
and not (re.search("^__gnu_local_gp", str(symbol)))):
- debug(DEBUG_SPAM, "needed_symbols adding %s, weak: %s" % (symbol, symbol.weak))
+ debug(DEBUG_SPAM, "needed_symbols adding %s, weak: %s, for %s" % (symbol, symbol.weak, obj))
needed_symbols[str(symbol)] = symbol
libraries.update(library_depends(obj))
# calculate what symbols are present in small_libs and available_libs
present_symbols = {}
+ present_symbol_progs = {}
checked_libs = small_libs
checked_libs.extend(available_libs)
checked_libs.append(sysroot + ldlib)
@@ -513,6 +519,12 @@ while 1:
names = symbol.base_names()
for name in names:
present_symbols[name] = symbol
+ if not so_pattern.match(lib):
+ debug(DEBUG_SPAM, "present_symbol_progs adding %s, from executable %s" % (' '.join(names), lib))
+ for name in names:
+ progs = present_symbol_progs.get(name, set())
+ progs.add(lib)
+ present_symbol_progs[name] = progs
# are we finished?
num_unresolved = 0
@@ -568,6 +580,14 @@ while 1:
for name in needed_symbols:
if not name in symbol_provider:
if not needed_symbols[name].weak:
+ # WORKAROUND: Undefined symbols in a library can be provided by the application
+ # that links to the library. So if the object which requires the symbol is a library
+ # and some application can provide the symbol, the undefined symbol is skipped.
+ symbol = needed_symbols[name]
+ if so_pattern.match(symbol.object) and present_symbol_progs.get(name, None):
+ debug(DEBUG_SPAM, "symbol %s in library %s is provided by executable %s" \
+ % (name, symbol.object, ' '.join(present_symbol_progs[name])))
+ continue
raise Exception("No library provides non-weak %s" % name)
else:
lib = symbol_provider[name]
--
2.16.1

26
meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch
View File

@@ -1,26 +0,0 @@
The libc6-dev in Ubuntu 9.04 is so old that the elf.h doesn't
define STT_GNU_IFUNC, so we have to define it ourselves.
Upstream-Status: Inappropriate [other] - old release specific, maybe removable
-- Dexuan Cui (dexuan.cui@intel.com) Feb 16, 2011.
diff --git a/src/mklibs-readelf/main.cpp b/src/mklibs-readelf/main.cpp
index 2444c39..56d93f8 100644
--- a/src/mklibs-readelf/main.cpp
+++ b/src/mklibs-readelf/main.cpp
@@ -6,6 +6,14 @@
#include <vector>
#include <elf.h>
+/*
+ * The /usr/include/elf.h in some distributions(like Ubuntu 9.04) doesn't
+ * define the macro. We need to define it here.
+ */
+#ifndef STT_GNU_IFUNC
+#define STT_GNU_IFUNC 10 /* Symbol is indirect code object */
+#endif
+
#include <getopt.h>
#include "elf.hpp"

81
meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
View File

@@ -1,81 +0,0 @@
Remove dependency on dpkg
Upstream-Status: Submitted
Asking the host OS whether it supports multiarch is not useful
in a cross-compilation environment, or if the user has specified
a libdir explicitly. So this patch, based on the work of Mentor
Graphics, removes mklibs's dependency on dpkg package.
Signed-off-by: Yuanjie Huang <Yuanjie.Huang@windriver.com>
src/mklibs | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/mklibs b/src/mklibs
index d9b784b..c5614ea 100755
--- a/src/mklibs
+++ b/src/mklibs
@@ -261,6 +261,11 @@ def extract_soname(so_file):
return ""
def multiarch(paths):
+ # Asking the host OS whether it supports multiarch is not useful
+ # in a cross-compilation environment, or if the user has specified
+ # a libdir explicitly.
+ if sysroot != "" or libdir != "":
+ return paths
devnull = open('/dev/null', 'w')
dpkg_architecture = subprocess.Popen(
['dpkg-architecture', '-qDEB_HOST_MULTIARCH'],
@@ -340,7 +345,7 @@ lib_path = []
dest_path = "DEST"
ldlib = "LDLIB"
include_default_lib_path = "yes"
-default_lib_path = multiarch(["/lib/", "/usr/lib/", "/usr/X11R6/lib/"])
+default_lib_path = ["/lib/", "/usr/lib/", "/usr/X11R6/lib/"]
libc_extras_dir = "/usr/lib/libc_pic"
libc_extras_dir_default = True
libdir = "lib"
@@ -386,7 +391,7 @@ for opt, arg in optlist:
elif opt == "--libdir":
libdir = arg
elif opt in ("--help", "-h"):
- usage(0)
+ usage(0)
sys.exit(0)
elif opt in ("--version", "-V"):
version(vers)
@@ -395,6 +400,7 @@ for opt, arg in optlist:
print "WARNING: unknown option: " + opt + "\targ: " + arg
if include_default_lib_path == "yes":
+ default_lib_path = multiarch(default_lib_path)
lib_path.extend([a.replace("/lib/", "/" + libdir + "/") for a in default_lib_path])
if libc_extras_dir_default:
@@ -661,16 +669,16 @@ ld_path_name = os.path.dirname(ldlib)
ld_full_path = "../" + ldlib
ld_file = find_lib(ld_file_name)
-if ld_path_name != "/lib":
- if os.access(dest_path + "/" + ld_file_name, os.F_OK):
- os.remove(dest_path + "/" + ld_file_name)
+#if ld_path_name != "/lib":
+# if os.access(dest_path + "/" + ld_file_name, os.F_OK):
+# os.remove(dest_path + "/" + ld_file_name)
-if not os.path.exists(dest_path + "/../" + ld_path_name):
- os.mkdir(dest_path + "/../" + ld_path_name)
+#if not os.path.exists(dest_path + "/../" + ld_path_name):
+# os.mkdir(dest_path + "/../" + ld_path_name)
-if not os.access(dest_path + "/" + ld_full_path, os.F_OK):
- debug(DEBUG_NORMAL, "I: stripping and copying dynamic linker to " + ld_full_path)
+if not os.access(dest_path + "/" + ld_file_name, os.F_OK):
+ debug(DEBUG_NORMAL, "I: stripping and copying dynamic linker to " + ld_file_name)
command(target + "objcopy", "--strip-unneeded -R .note -R .comment",
- ld_file, dest_path + "/" + ld_full_path)
+ ld_file, dest_path + "/" + ld_file_name)
-os.chmod(dest_path + "/" + ld_full_path, 0755)
+os.chmod(dest_path + "/" + ld_file_name, 0755)

34
meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
View File

@@ -1,34 +0,0 @@
From eddf04c7f8312e9c29cdb24e431b7e4fb2cc70ed Mon Sep 17 00:00:00 2001
From: Yuanjie Huang <yuanjie.huang@windriver.com>
Date: Wed, 15 Apr 2015 14:00:06 +0800
Subject: [PATCH] Show GNU unique symbols as provided symbols
Upstream-Status: Submitted
GNU Unique symbol is a GNU extension employed by new version of GCC
by default. Even Standard C++ library in GCC 4.9 provides some symbols,
such as _ZNSs4_Rep20_S_empty_rep_storageE in this binding type instead
of ELF standard weak binding.
This patch adds support of this new binding type to mklibs-readelf.
Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
---
src/mklibs-readelf/main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mklibs-readelf/main.cpp b/src/mklibs-readelf/main.cpp
index 56d93f8..0134530 100644
--- a/src/mklibs-readelf/main.cpp
+++ b/src/mklibs-readelf/main.cpp
@@ -88,7 +88,7 @@ static void process_symbols_provided (const Elf::section_type<Elf::section_type_
uint8_t type = symbol->get_type ();
const std::string &name = symbol->get_name_string ();
- if (bind != STB_GLOBAL && bind != STB_WEAK)
+ if (bind != STB_GLOBAL && bind != STB_WEAK && bind != STB_GNU_UNIQUE)
continue;
if (shndx == SHN_UNDEF || shndx == SHN_ABS)
continue;
--
1.8.5.2.233.g932f7e4

18
meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch
View File

@@ -1,18 +0,0 @@
In cross builds we will have to respect sysroot
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: mklibs-0.1.39/src/mklibs
===================================================================
--- mklibs-0.1.39.orig/src/mklibs 2014-03-01 18:25:36.000000000 +0000
+++ mklibs-0.1.39/src/mklibs 2014-10-19 00:51:46.813534596 +0000
@@ -495,7 +495,7 @@
present_symbols = {}
checked_libs = small_libs
checked_libs.extend(available_libs)
- checked_libs.append(ldlib)
+ checked_libs.append(sysroot + ldlib)
for lib in checked_libs:
for symbol in provided_symbols(lib):
debug(DEBUG_SPAM, "present_symbols adding %s" % symbol)

22
meta/recipes-devtools/mklibs/mklibs-native_0.1.44.bb
View File

@@ -1,22 +0,0 @@
SUMMARY = "Shared library optimisation tool"
DESCRIPTION = "mklibs produces cut-down shared libraries that contain only the routines required by a particular set of executables."
HOMEPAGE = "https://launchpad.net/mklibs"
SECTION = "devel"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://debian/copyright;md5=98d31037b13d896e33890738ef01af64"
SRC_URI = "http://snapshot.debian.org/archive/debian/20180828T214102Z/pool/main/m/mklibs/mklibs_${PV}.tar.xz \
file://ac_init_fix.patch\
file://fix_STT_GNU_IFUNC.patch\
file://sysrooted-ldso.patch \
file://avoid-failure-on-symbol-provided-by-application.patch \
file://show-GNU-unique-symbols-as-provided-symbols.patch \
file://fix_cross_compile.patch \
"
SRC_URI[md5sum] = "6b6eeb9b4016c6a7317acc28c89e32cc"
SRC_URI[sha256sum] = "3af0b6bd35e5b6fc58d8b68827fbae2ff6b7e20dd2b238ccb9b49d84722066c2"
UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/m/mklibs/"
inherit autotools gettext native