summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamian Wrobel <dwrobel@ertelnet.rybnik.pl>2020-07-02 11:23:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-03 11:37:20 +0100
commitad4ff7c18cc6a5c15a0525149dbe2dbd5ae39129 (patch)
treeaa7f17ad5d1278b521671384ebb30744a6a70e33
parent5509c7247fb44c8fb98298f2b309cc1a87b07f14 (diff)
downloadopenembedded-core-ad4ff7c18cc6a5c15a0525149dbe2dbd5ae39129.tar.gz
rootfs: do not let ldconfig to create symlinks
Adds -X option to ldconfig to not create symlinks as part of the ldconfig cache creation process. It is much better to keep all needed symlinks as part of of the package then let ldconfig do the job. In the case symlink was created by ldconfig and later on the package got removed the dangling link will remain on the filesystem. Not to mention that such a symlink is orphaned (e.g. rpm -qf <file-path> will not show the package the symlink is part of). It also align the behaviour with libc-musl where the ldconfig is not invoked by default. Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/rootfs.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index a0ac33ada6..0e05f1f75e 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -297,9 +297,9 @@ class Rootfs(object, metaclass=ABCMeta):
def _run_ldconfig(self):
if self.d.getVar('LDCONFIGDEPEND'):
- bb.note("Executing: ldconfig -r " + self.image_rootfs + " -c new -v")
+ bb.note("Executing: ldconfig -r " + self.image_rootfs + " -c new -v -X")
self._exec_shell_cmd(['ldconfig', '-r', self.image_rootfs, '-c',
- 'new', '-v'])
+ 'new', '-v', '-X'])
def _check_for_kernel_modules(self, modules_dir):
for root, dirs, files in os.walk(modules_dir, topdown=True):