]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
systemd: check "ldconfig" distro feature when setting PACKAGECONFIG
authorAndre McCurdy <armccurdy@gmail.com>
Fri, 27 Jan 2017 22:29:11 +0000 (14:29 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 4 Mar 2017 23:18:09 +0000 (23:18 +0000)
Avoid trying to call ldconfig at run-time in distros which don't
provide ldconfig on the target.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-core/systemd/systemd_232.bb

index 9ec8378a30dc10af8f4f03e0ffbeba9d72c2a117..e67d52a1df7f772417f89f1eeb3458e4ea86a8d1 100644 (file)
@@ -40,8 +40,7 @@ SRC_URI_append_libc-uclibc = "\
 SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"
 
 PACKAGECONFIG ??= "xz \
-                   ldconfig \
-                   ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux', d)} \
+                   ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux ldconfig', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
                    binfmt \