summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-03-05 01:23:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-10 10:47:48 +0000
commit664c1dfe226557f9dbbd86fd4bfbd00c834bfb5f (patch)
tree4c5a03e9f2016b6213825770b16fcb146b9ac04c /meta/recipes-core
parentbd0ed7ce67a6e9d292468d15c9d0a7460edf6872 (diff)
downloadpoky-664c1dfe226557f9dbbd86fd4bfbd00c834bfb5f.tar.gz
systemd: Create packageconfig for ldconfig support
Useful when we disable ldconfig in glibc, we need to be able to turn it off in systemd too, otherwise systemd tries to launch the service and it fails Change-Id: I170307f809a13def0cafc282e88d4eafa0313c31 (From OE-Core rev: 9c2eb7f4774356fabf21ff5147a7d34601fb57c8) Signed-off-by: Khem Raj <raj.khem@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_219.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index 95b3f49148..454268a33a 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -58,7 +58,7 @@ LDFLAGS_append_libc-uclibc = " -lrt"
58 58
59GTKDOC_DOCDIR = "${S}/docs/" 59GTKDOC_DOCDIR = "${S}/docs/"
60 60
61PACKAGECONFIG ??= "xz \ 61PACKAGECONFIG ??= "xz ldconfig \
62 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 62 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
63 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)}" 63 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)}"
64 64
@@ -83,6 +83,7 @@ PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam"
83PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" 83PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
84# Update NAT firewall rules 84# Update NAT firewall rules
85PACKAGECONFIG[iptc] = "--enable-libiptc,--disable-libiptc,iptables" 85PACKAGECONFIG[iptc] = "--enable-libiptc,--disable-libiptc,iptables"
86PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,,"
86 87
87CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill" 88CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill"
88 89