summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-02-21 17:08:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-26 22:43:02 +0000
commit123e3c2fba6b1d13c738f9592719b92588fe6a44 (patch)
treeecaa5d718add7e09e7b90eeaf358ebbf2e693733 /meta/recipes-core
parentc2aab97e961ce719ba95409c64433ab2df4ecff8 (diff)
downloadpoky-123e3c2fba6b1d13c738f9592719b92588fe6a44.tar.gz
systemd: make xz support (compressed journal) optional, defaulting to on.
Compressed journals means using liblzma, sf the journal isn't going to be used this can be disabled. (From OE-Core rev: 5dcfe269c844673102beaacc6007fbd49f6b6d90) 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_197.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb
index 5180eef2b3..dc54f366f7 100644
--- a/meta/recipes-core/systemd/systemd_197.bb
+++ b/meta/recipes-core/systemd/systemd_197.bb
@@ -11,7 +11,7 @@ PROVIDES = "udev"
11PE = "1" 11PE = "1"
12PR = "r4" 12PR = "r4"
13 13
14DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0" 14DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0"
15DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 15DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
16 16
17SECTION = "base/shell" 17SECTION = "base/shell"
@@ -43,9 +43,11 @@ LDFLAGS_libc-uclibc_append = " -lrt"
43 43
44GTKDOC_DOCDIR = "${S}/docs/" 44GTKDOC_DOCDIR = "${S}/docs/"
45 45
46PACKAGECONFIG ??= "" 46PACKAGECONFIG ??= "xz"
47# Sign the journal for anti-tampering 47# Sign the journal for anti-tampering
48PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" 48PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
49# Compress the journal
50PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"
49 51
50CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill" 52CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill"
51 53