summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-02-27 14:57:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-27 19:03:10 +0000
commit9bd1da2f9c9c331f22704f36246a4e632248e2e3 (patch)
treee35f2f3b456fc6a030f6bda99ae606d2d07bfdb9
parentaef3a581cfe5ebfca07451bcb0791aeecb97c21e (diff)
downloadpoky-9bd1da2f9c9c331f22704f36246a4e632248e2e3.tar.gz
systemd: add PACKAGECONFIG for xkbcommon and iptables
systemd has optional support for xkbcommon (verify keymaps when locale changes) and iptables (configure NAT rules). Add PACKAGECONFIG options for these, disabling iptables by default and respecting the X11 DISTRO_FEATURE for libxkbcommon (as the code involves X11 keymaps). (From OE-Core rev: a3e9a86c8765a60ef0ef282f0fe3f3c733a8e3a3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_219.bb9
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index 747964e038..f245239c18 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -55,7 +55,10 @@ LDFLAGS_append_libc-uclibc = " -lrt"
55 55
56GTKDOC_DOCDIR = "${S}/docs/" 56GTKDOC_DOCDIR = "${S}/docs/"
57 57
58PACKAGECONFIG ??= "xz ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 58PACKAGECONFIG ??= "xz \
59 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
60 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)}"
61
59PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl" 62PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl"
60# Sign the journal for anti-tampering 63# Sign the journal for anti-tampering
61PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" 64PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
@@ -73,6 +76,10 @@ PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn"
73PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit" 76PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit"
74PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" 77PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
75PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam" 78PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam"
79# Verify keymaps on locale change
80PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
81# Update NAT firewall rules
82PACKAGECONFIG[iptc] = "--enable-libiptc,--disable-libiptc,iptables"
76 83
77CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill" 84CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill"
78 85