Patchwork [5/7] systemd: make xz support (compressed journal) optional

login
register
mail settings
Submitter Ross Burton
Date Feb. 27, 2013, 2:17 p.m.
Message ID <6eb9f87bd871b294ec0bef6744bd71a651ff8d10.1361974597.git.ross.burton@intel.com>
Download mbox | patch
Permalink /patch/45213/
State New
Headers show

Comments

Ross Burton - Feb. 27, 2013, 2:17 p.m.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-core/systemd/systemd_197.bb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Koen Kooi - Feb. 27, 2013, 2:41 p.m.
On Wed, 2013-02-27 at 14:17 +0000, Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-core/systemd/systemd_197.bb |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb
> index 7a11c8c..0e13d78 100644
> --- a/meta/recipes-core/systemd/systemd_197.bb
> +++ b/meta/recipes-core/systemd/systemd_197.bb
> @@ -11,7 +11,7 @@ PROVIDES = "udev"
>  PE = "1"
>  PR = "r4"
>  
> -DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0"
> +DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0"
>  DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
>  
>  SECTION = "base/shell"
> @@ -48,6 +48,8 @@ GTKDOC_DOCDIR = "${S}/docs/"
>  PACKAGECONFIG ??= ""
>  # Sign the journal for anti-tampering
>  PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
> +# Compress the journal
> +PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"
>  
>  # The gtk+ tools should get built as a separate recipe e.g. systemd-tools
>  EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \

Your commit fails to mention that you are changing the default to off,
it is on now.
Ross Burton - Feb. 27, 2013, 2:58 p.m.
On 27 February 2013 14:41, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Your commit fails to mention that you are changing the default to off,
> it is on now.

That's true.  I'm actually dithering on this now, and will probably
flip it back to enabled by default but still an option for people who
want to prune dependencies.

Ross

Patch

diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb
index 7a11c8c..0e13d78 100644
--- a/meta/recipes-core/systemd/systemd_197.bb
+++ b/meta/recipes-core/systemd/systemd_197.bb
@@ -11,7 +11,7 @@  PROVIDES = "udev"
 PE = "1"
 PR = "r4"
 
-DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0"
+DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SECTION = "base/shell"
@@ -48,6 +48,8 @@  GTKDOC_DOCDIR = "${S}/docs/"
 PACKAGECONFIG ??= ""
 # Sign the journal for anti-tampering
 PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
+# Compress the journal
+PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"
 
 # The gtk+ tools should get built as a separate recipe e.g. systemd-tools
 EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \