[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4959/8267] systemd: check "ldconfig" distro feature when setting PACKAGECONFIG
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 4959/8267] systemd: check "ldconfig" distro feature when setting PACKAGECONFIG
- Date: Sun, 17 Dec 2017 02:46:04 +0000 (UTC)
commit 47b2cf698be2ed2b49683d501bcb801212bb6b49
Author: Andre McCurdy <armccurdy gmail com>
Date: Fri Jan 27 14:29:11 2017 -0800
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>
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 9ec8378..e67d52a 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 \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]