summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-01-27 14:29:11 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-04 23:18:09 +0000
commitfaff19f046e881f546c1ad397e101c000c9bba3d (patch)
treece9655d13eef8018fc588858eb2985f485e182fa
parent7b73fbc64fe087098b9d1744aeb781eede355f12 (diff)
downloadopenembedded-core-contrib-faff19f046e881f546c1ad397e101c000c9bba3d.tar.gz
openembedded-core-contrib-faff19f046e881f546c1ad397e101c000c9bba3d.tar.bz2
openembedded-core-contrib-faff19f046e881f546c1ad397e101c000c9bba3d.zip
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 <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/systemd/systemd_232.bb3
1 files changed, 1 insertions, 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 \