summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-01-04 10:20:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-07 13:40:15 +0000
commit3fea163f40bd6d92697d20ae2b775a974d596868 (patch)
tree84f7ad5de0eab19f4c448e78a4b96941fabe85f1 /meta/recipes-core
parentd462b70b29d7a26c67bb3546d5d6797f138395c5 (diff)
downloadpoky-3fea163f40bd6d92697d20ae2b775a974d596868.tar.gz
systemd: add more compression and importd PACKAGECONFIGs
Add explicit PACKAGECONFIGs for all of compression formats that systemd can detect at configure time, and an explicit enable/disable for importd. importd defaults to disabled as it needs curl and all the compression formats to be enabled. (From OE-Core rev: 24d358c44770b2ea145380f8648d6797b7bdb04c) 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_228.bb8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_228.bb b/meta/recipes-core/systemd/systemd_228.bb
index 0f95390acd..6673042f94 100644
--- a/meta/recipes-core/systemd/systemd_228.bb
+++ b/meta/recipes-core/systemd/systemd_228.bb
@@ -70,13 +70,13 @@ PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
70# regardless of PACKAGECONFIG, libgcrypt is always required to expand 70# regardless of PACKAGECONFIG, libgcrypt is always required to expand
71# the AM_PATH_LIBGCRYPT autoconf macro 71# the AM_PATH_LIBGCRYPT autoconf macro
72DEPENDS += "libgcrypt" 72DEPENDS += "libgcrypt"
73# Compress the journal
74PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"
75PACKAGECONFIG[cryptsetup] = "--enable-libcryptsetup,--disable-libcryptsetup,cryptsetup" 73PACKAGECONFIG[cryptsetup] = "--enable-libcryptsetup,--disable-libcryptsetup,cryptsetup"
76PACKAGECONFIG[microhttpd] = "--enable-microhttpd,--disable-microhttpd,libmicrohttpd" 74PACKAGECONFIG[microhttpd] = "--enable-microhttpd,--disable-microhttpd,libmicrohttpd"
77PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils" 75PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils"
78PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved" 76PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved"
79PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd" 77PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd"
78# importd requires curl/xz/zlib/bzip2/gcrypt
79PACKAGECONFIG[importd] = "--enable-importd,--disable-importd"
80PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" 80PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn"
81PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit" 81PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit"
82PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" 82PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
@@ -92,6 +92,10 @@ PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode"
92PACKAGECONFIG[compat] = "--enable-compat-libs,--disable-compat-libs" 92PACKAGECONFIG[compat] = "--enable-compat-libs,--disable-compat-libs"
93PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" 93PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
94PACKAGECONFIG[coredump] = "--enable-coredump,--disable-coredump" 94PACKAGECONFIG[coredump] = "--enable-coredump,--disable-coredump"
95PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2"
96PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4"
97PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"
98PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
95 99
96CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" 100CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill"
97CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" 101CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod"