summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
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:38:24 +0100
commit061eb6f501c6262266230919ef55ebf02a26abcd (patch)
treecd7011cbe64d75087b25af71ba84a07d49ab709c /meta/lib/oe
parent43345b55b7d49380cc772ec97f860943ffa0814c (diff)
downloadpoky-061eb6f501c6262266230919ef55ebf02a26abcd.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. (From OE-Core rev: ad4ff7c18cc6a5c15a0525149dbe2dbd5ae39129) Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-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):
297 297
298 def _run_ldconfig(self): 298 def _run_ldconfig(self):
299 if self.d.getVar('LDCONFIGDEPEND'): 299 if self.d.getVar('LDCONFIGDEPEND'):
300 bb.note("Executing: ldconfig -r " + self.image_rootfs + " -c new -v") 300 bb.note("Executing: ldconfig -r " + self.image_rootfs + " -c new -v -X")
301 self._exec_shell_cmd(['ldconfig', '-r', self.image_rootfs, '-c', 301 self._exec_shell_cmd(['ldconfig', '-r', self.image_rootfs, '-c',
302 'new', '-v']) 302 'new', '-v', '-X'])
303 303
304 def _check_for_kernel_modules(self, modules_dir): 304 def _check_for_kernel_modules(self, modules_dir):
305 for root, dirs, files in os.walk(modules_dir, topdown=True): 305 for root, dirs, files in os.walk(modules_dir, topdown=True):