From faff19f046e881f546c1ad397e101c000c9bba3d Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Fri, 27 Jan 2017 14:29:11 -0800 Subject: systemd: check "ldconfig" distro feature when setting PACKAGECONFIG Avoid trying to call ldconfig at run-time in distros which don't provide ldconfig on the target. Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- meta/recipes-core/systemd/systemd_232.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb index 9ec8378a30..e67d52a1df 100644 --- a/meta/recipes-core/systemd/systemd_232.bb +++ b/meta/recipes-core/systemd/systemd_232.bb @@ -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 \ -- cgit 1.2.3-korg