[meta-oe][PATCH v2 1/3] systemd: enable xz compression for journald

[meta-oe][PATCH v2 1/3] systemd: enable xz compression for journald

[Koen Kooi]

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta-oe/recipes-core/systemd/systemd_git.bb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 62a326e..2b549a0 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 
-DEPENDS = "docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline udev dbus libcap libcgroup tcp-wrappers"
+DEPENDS = "xz docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline udev dbus libcap libcgroup tcp-wrappers"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
@@ -14,7 +14,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r17"
+PR = "r18"
 
 inherit useradd pkgconfig autotools vala perlnative
 
@@ -44,6 +44,7 @@ EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
                  --with-rootlibdir=${base_libdir} \
                  ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
                  --disable-gtk \
+                 --enable-xz \
                "
 
 # There's no docbook-xsl-native, so for the xsltproc check to false
-- 
1.7.2.5

[meta-oe][PATCH v2 2/3] systemd: enable logging to disk instead of tmpfs

[Koen Kooi]

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta-oe/recipes-core/systemd/systemd_git.bb |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 2b549a0..4a8e9a1 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r18"
+PR = "r19"
 
 inherit useradd pkgconfig autotools vala perlnative
 
@@ -59,6 +59,9 @@ do_install() {
 
 	# provide support for initramfs
 	ln -s ${base_bindir}/systemd ${D}/init
+
+	# create dir for journal
+	install -d ${D}${localstatedir}/log/journal
 }
 
 python populate_packages_prepend (){
-- 
1.7.2.5

[meta-oe][PATCH v2 3/3] systemd: update to latest git

[Koen Kooi]

This is in preparation for the v44 release.

* drop 2 patches that aren't needed anymore
* fix more endianness problems
* fix journal crashes with large files

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../0001-docs-fix-build-without-xsltproc.patch     |   41 --------------------
 .../0001-systemd-journald-fix-endianess-bug.patch  |   29 --------------
 meta-oe/recipes-core/systemd/systemd_git.bb        |   15 +++----
 3 files changed, 7 insertions(+), 78 deletions(-)
 delete mode 100644 meta-oe/recipes-core/systemd/systemd/0001-docs-fix-build-without-xsltproc.patch
 delete mode 100644 meta-oe/recipes-core/systemd/systemd/0001-systemd-journald-fix-endianess-bug.patch

diff --git a/meta-oe/recipes-core/systemd/systemd/0001-docs-fix-build-without-xsltproc.patch b/meta-oe/recipes-core/systemd/systemd/0001-docs-fix-build-without-xsltproc.patch
deleted file mode 100644
index 390d65c..0000000
--- a/meta-oe/recipes-core/systemd/systemd/0001-docs-fix-build-without-xsltproc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7395173a5af08e9e58aed33e831d0bfc6515891d Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sun, 2 Oct 2011 19:54:29 +0200
-Subject: [PATCH 1/2] docs: fix build without xsltproc
-
-Make would choke on missing rules for man/systemd.1
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-
-Upstream-status: rejected [fix your docbook install]
-
----
- Makefile.am |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index f1f975f..53f99a1 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -649,6 +649,7 @@ EXTRA_DIST += \
- 	src/acl-util.h \
- 	src/logs-show.h
- 
-+if HAVE_XSLTPROC
- MANPAGES = \
- 	man/systemd.1 \
- 	man/systemctl.1 \
-@@ -721,6 +722,10 @@ EXTRA_DIST += \
- 	$(XML_IN_FILES) \
- 	${nodist_man_MANS:=.in} \
- 	${XML_IN_FILES:.xml.in=.html.in}
-+else
-+MANPAGES =
-+MANPAGES_ALIAS =
-+endif
- 
- systemd_SOURCES = \
- 	src/main.c
--- 
-1.7.2.5
-
diff --git a/meta-oe/recipes-core/systemd/systemd/0001-systemd-journald-fix-endianess-bug.patch b/meta-oe/recipes-core/systemd/systemd/0001-systemd-journald-fix-endianess-bug.patch
deleted file mode 100644
index b41d5eb..0000000
--- a/meta-oe/recipes-core/systemd/systemd/0001-systemd-journald-fix-endianess-bug.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d228134ff5af3bd0ef1087e9bee66583c1546553 Mon Sep 17 00:00:00 2001
-From: Dirk Eibach <eibach@gdsys.de>
-Date: Wed, 29 Feb 2012 12:45:46 +0100
-Subject: [PATCH] systemd-journald: fix endianess bug
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
-
-Upstream-status: Submitted
-
- src/journal/journal-file.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 20ca3f6..275caea 100644
---- a/src/journal/journal-file.c
-+++ b/src/journal/journal-file.c
-@@ -238,7 +238,7 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
-         if (fstat(f->fd, &f->last_stat) < 0)
-                 return -errno;
- 
--        f->header->arena_size = new_size - htole64(f->header->arena_offset);
-+        f->header->arena_size = htole64(new_size - le64toh(f->header->arena_offset));
- 
-         return 0;
- }
--- 
-1.7.7.4
-
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 4a8e9a1..918b314 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 
-DEPENDS = "xz docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline udev dbus libcap libcgroup tcp-wrappers"
+DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline udev dbus libcap libcgroup tcp-wrappers"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
@@ -14,16 +14,14 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r19"
+PR = "r21"
 
 inherit useradd pkgconfig autotools vala perlnative
 
-SRCREV = "d26e4270409506cd398875216413b651d6ee7de6"
+SRCREV = "48496df65c3ad1e3ad055d2b4632da7b73211715"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \
-           file://0001-docs-fix-build-without-xsltproc.patch \
            file://0002-systemd-logind-don-t-kill-user-processes-on-exit.patch \
-           file://0001-systemd-journald-fix-endianess-bug.patch \
            ${UCLIBCPATCHES} \
           "
 UCLIBCPATCHES = ""
@@ -45,6 +43,7 @@ EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
                  ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
                  --disable-gtk \
                  --enable-xz \
+                 --disable-manpages \
                "
 
 # There's no docbook-xsl-native, so for the xsltproc check to false
@@ -58,7 +57,7 @@ do_install() {
 	rm ${D}${base_libdir}/systemd/system/serial-getty* -f
 
 	# provide support for initramfs
-	ln -s ${base_bindir}/systemd ${D}/init
+	ln -s ${base_libdir}/systemd/systemd ${D}/init
 
 	# create dir for journal
 	install -d ${D}${localstatedir}/log/journal
@@ -134,7 +133,7 @@ RRECOMMENDS_${PN} += "systemd-serialgetty \
 # u-a for runlevel and telinit
 
 pkg_postinst_systemd () {
-update-alternatives --install ${base_sbindir}/init init ${base_bindir}/systemd 300
+update-alternatives --install ${base_sbindir}/init init ${base_libdir}/systemd/systemd 300
 update-alternatives --install ${base_sbindir}/halt halt ${base_bindir}/systemctl 300
 update-alternatives --install ${base_sbindir}/reboot reboot ${base_bindir}/systemctl 300
 update-alternatives --install ${base_sbindir}/shutdown shutdown ${base_bindir}/systemctl 300
@@ -142,7 +141,7 @@ update-alternatives --install ${base_sbindir}/poweroff poweroff ${base_bindir}/s
 }
 
 pkg_prerm_systemd () {
-update-alternatives --remove init ${base_bindir}/systemd
+update-alternatives --remove init ${base_libdir}/systemd/systemd
 update-alternatives --remove halt ${base_bindir}/systemctl
 update-alternatives --remove reboot ${base_bindir}/systemctl
 update-alternatives --remove shutdown ${base_bindir}/systemctl
-- 
1.7.2.5

Re: [meta-oe][PATCH v2 2/3] systemd: enable logging to disk instead of tmpfs

[Otavio Salvador]

On Tue, Mar 6, 2012 at 06:22, Koen Kooi <koen@dominion.thruhere.net> wrote:
> +       # create dir for journal
> +       install -d ${D}${localstatedir}/log/journal

I am not against it creating the path for storing the logs but the
default configuration ought to use a memory buffer IMO.

What people think?

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br


-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-oe][PATCH v2 2/3] systemd: enable logging to disk instead of tmpfs

[Andreas Müller]

On Tue, Mar 6, 2012 at 12:59 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Tue, Mar 6, 2012 at 06:22, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> +       # create dir for journal
>> +       install -d ${D}${localstatedir}/log/journal
>
> I am not against it creating the path for storing the logs but the
> default configuration ought to use a memory buffer IMO.
>
> What people think?
>
To make up mind: Which amount of memory do we expect per boot
approximately (uncompressed/compressed)?

Andreas

Re: [meta-oe][PATCH v2 3/3] systemd: update to latest git

[Andreas Müller]

On Tue, Mar 6, 2012 at 10:22 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> This is in preparation for the v44 release.
>
> * drop 2 patches that aren't needed anymore
> * fix more endianness problems
> * fix journal crashes with large files
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Acked-by: Andreas Müller <schnitzeltony@googlemail.com>

Re: [meta-oe][PATCH v2 2/3] systemd: enable logging to disk instead of tmpfs

[Andreas Müller]

On Tue, Mar 6, 2012 at 1:21 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Tue, Mar 6, 2012 at 12:59 PM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> On Tue, Mar 6, 2012 at 06:22, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>> +       # create dir for journal
>>> +       install -d ${D}${localstatedir}/log/journal
>>
>> I am not against it creating the path for storing the logs but the
>> default configuration ought to use a memory buffer IMO.
>>
>> What people think?
>>
> To make up mind: Which amount of memory do we expect per boot
> approximately (uncompressed/compressed)?
>
I played around with this a bit: After boot & starting GUI there is a
single file of ~600kB. After working with the system for few days the
contents of the folder grew up to ~40MB.

After reading journal design document [1] it seems that 'rotating'
scales with maximum size available.

My personal opinion: since RAM is most expensive prefer flash/disk as
default ( as Koen already pointed out this default can be simply
overridden by deleting /var/log/journal [2][3] )

so

Acked-by: Andreas Müller <schnitzeltony@googlemail.com>

Andreas

[1] https://docs.google.com/document/pub?id=1IC9yOXj7j6cdLLxWEBAGRL6wl97tFxgjLUEHIX3MSTs
[2] http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-March/038427.html
[3] http://lwn.net/Articles/474968/

Re: [meta-oe][PATCH v2 2/3] systemd: enable logging to disk instead of tmpfs

[Otavio Salvador]

On Thu, Mar 8, 2012 at 14:15, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> My personal opinion: since RAM is most expensive prefer flash/disk as
> default ( as Koen already pointed out this default can be simply
> overridden by deleting /var/log/journal [2][3] )

If this is the case, then let's make this patch ensure this works out
of box ... I do think most people will get full flash/disk without
knowing why.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-oe][PATCH v2 2/3] systemd: enable logging to disk instead of tmpfs

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 08-03-12 18:59, Otavio Salvador schreef:
> On Thu, Mar 8, 2012 at 14:15, Andreas Müller 
> <schnitzeltony@googlemail.com> wrote:
>> My personal opinion: since RAM is most expensive prefer flash/disk as 
>> default ( as Koen already pointed out this default can be simply 
>> overridden by deleting /var/log/journal [2][3] )
> 
> If this is the case, then let's make this patch ensure this works out of
> box ... I do think most people will get full flash/disk without knowing
> why.

We're working on it with the systemd people to see what is causing the
'runaway' logs.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk9Zp9gACgkQMkyGM64RGpEdEQCgrvRjHfFYxa8ZSwi647xeQffa
47IAnR/aaqwUVbVBPiE5+XV7KtYcBrrA
=x8rX
-----END PGP SIGNATURE-----