1
0
mirror of https://github.com/gryf/mkinitramfs.git synced 2025-12-19 04:20:19 +01:00

Use single library path.

There can be several directories, where libs are being searched for.
That behavior can be either hardcoded in the specific program, or
defined in /etc/ld.so.conf. To keep things simple, I'd just use
lib/lib64 (libe is a symlink to lib64) well-known location for the
shared libs.
This commit is contained in:
2023-05-11 11:02:34 +02:00
parent 9ea18fa68b
commit 84f93c519f

View File

@@ -37,7 +37,7 @@ for bin in ${DEPS[*]}; do
for lib in $(ldd $bin | sed -nre 's,.* (/.*lib.*/.*.so.*) .*,\\1,p' \\ for lib in $(ldd $bin | sed -nre 's,.* (/.*lib.*/.*.so.*) .*,\\1,p' \\
-e 's,.*(/lib.*/ld.*.so.*) .*,\\1,p') -e 's,.*(/lib.*/ld.*.so.*) .*,\\1,p')
do do
mkdir -p .${lib%/*} && cp {,.}$lib cp $lib lib64/
done done
done done
# extra lib for new version of cryptsetup, which need to do locks # extra lib for new version of cryptsetup, which need to do locks
@@ -251,7 +251,7 @@ class Initramfs(object):
def _make_dirs(self): def _make_dirs(self):
os.chdir(self.dirname) os.chdir(self.dirname)
for dir_ in ('bin', 'dev', 'etc', 'keys', 'lib64', 'proc', for dir_ in ('bin', 'dev', 'etc', 'keys', 'lib64', 'proc',
'run/cryptsetup', 'run/lock', 'sys', 'tmp', 'usr'): 'run/cryptsetup', 'run/lock', 'sys', 'tmp'):
os.makedirs(os.path.join(self.dirname, dir_)) os.makedirs(os.path.join(self.dirname, dir_))
for link, target in (('lib', 'lib64'), ('sbin', 'bin'), for link, target in (('lib', 'lib64'), ('sbin', 'bin'),