diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2017-01-27 14:29:11 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-04 23:18:20 +0000 |
commit | 47b2cf698be2ed2b49683d501bcb801212bb6b49 (patch) | |
tree | c22e54436beb25489a1b97f7edb7e8118092c266 /meta/recipes-core | |
parent | 0808926dc297cc45427165feddb2b6568f089bd1 (diff) | |
download | poky-47b2cf698be2ed2b49683d501bcb801212bb6b49.tar.gz |
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.
(From OE-Core rev: faff19f046e881f546c1ad397e101c000c9bba3d)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/systemd/systemd_232.bb | 3 |
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 = "\ | |||
40 | SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" | 40 | SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" |
41 | 41 | ||
42 | PACKAGECONFIG ??= "xz \ | 42 | PACKAGECONFIG ??= "xz \ |
43 | ldconfig \ | 43 | ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux ldconfig', d)} \ |
44 | ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux', d)} \ | ||
45 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ | 44 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ |
46 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ | 45 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ |
47 | binfmt \ | 46 | binfmt \ |