summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-07-08 14:26:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-09 18:00:20 +0100
commit1881c5e0c426a193630e5eed5b629b69ff3741d5 (patch)
tree83e6fb1bb8d269d69dd52dab49202c3eba1edeb7
parentfbe51e01f9c7da714c0602fb1e27ffeb05825b00 (diff)
downloadpoky-1881c5e0c426a193630e5eed5b629b69ff3741d5.tar.gz
systemd: add PACKAGECONFIG selinux
Add PACKAGECONFIG 'selinux' for systemd. debug-shell.service starts different shell according whether selinux is enabled. (From OE-Core rev: 3d1aa27191fe4c21428eaf4ae036acb1496b7df7) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_219.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index bac2784370..8010405da5 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -62,7 +62,9 @@ GTKDOC_DOCDIR = "${S}/docs/"
62 62
63PACKAGECONFIG ??= "xz ldconfig \ 63PACKAGECONFIG ??= "xz ldconfig \
64 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 64 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
65 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)}" 65 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
66 ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
67 "
66 68
67PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl" 69PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl"
68# Sign the journal for anti-tampering 70# Sign the journal for anti-tampering
@@ -86,6 +88,7 @@ PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
86# Update NAT firewall rules 88# Update NAT firewall rules
87PACKAGECONFIG[iptc] = "--enable-libiptc,--disable-libiptc,iptables" 89PACKAGECONFIG[iptc] = "--enable-libiptc,--disable-libiptc,iptables"
88PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,," 90PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,,"
91PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
89 92
90CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" 93CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill"
91CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" 94CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod"