systemd: add patches for build and runtime issues

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 70 insertions, 8 deletions

diff --git a/patches/systemd-189/0001-journald-add-missing-includes.patch b/patches/systemd-189/0001-journald-add-missing-includes.patch
index e2f204df1..41dd8c52b 100644
--- a/patches/systemd-189/0001-journald-add-missing-includes.patch
+++ b/patches/systemd-189/0001-journald-add-missing-includes.patch
@@ -1,4 +1,3 @@
-From 4871690d9e32608bbd9b18505b5326c2079c9690 Mon Sep 17 00:00:00 2001
 From: Allin Cottrell <cottrell@wfu.edu>
 Date: Fri, 24 Aug 2012 01:46:38 +0200
 Subject: [PATCH] journald: add missing includes
@@ -83,6 +82,3 @@ index daed095..9db9198 100644
  #include <sys/epoll.h>
  
  #include "socket-util.h"
--- 
-1.7.10.4
-
diff --git a/patches/systemd-189/0002-journald-fix-building-with-XZ-support-disabled.patch b/patches/systemd-189/0002-journald-fix-building-with-XZ-support-disabled.patch
index 64d96b282..ea485ca98 100644
--- a/patches/systemd-189/0002-journald-fix-building-with-XZ-support-disabled.patch
+++ b/patches/systemd-189/0002-journald-fix-building-with-XZ-support-disabled.patch
@@ -1,4 +1,3 @@
-From 3d18857a29e082fb6b763fd2d41563c4feb6d966 Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Fri, 24 Aug 2012 11:25:56 +0200
 Subject: [PATCH] journald: fix building with XZ support disabled
@@ -34,6 +33,3 @@ index 2401293..5d134bd 100644
                  } else
                          h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload));
  
--- 
-1.7.10.4
-
diff --git a/patches/systemd-189/0003-libsystemd-core-needs-libsystemd-id128-internal.patch b/patches/systemd-189/0003-libsystemd-core-needs-libsystemd-id128-internal.patch
new file mode 100644
index 000000000..013e52dbf
--- /dev/null
+++ b/patches/systemd-189/0003-libsystemd-core-needs-libsystemd-id128-internal.patch
@@ -0,0 +1,32 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 3 Sep 2012 13:45:34 +0200
+Subject: [PATCH] libsystemd-core needs libsystemd-id128-internal
+
+Otherwise compiling may fail with e.g.:
+
+./.libs/libsystemd-core.a(libsystemd_core_la-condition.o): In function `test_host':
+[...]/systemd-189/src/core/condition.c:205: undefined reference to `sd_id128_from_string'
+[...]/systemd-189/src/core/condition.c:207: undefined reference to `sd_id128_get_machine'
+collect2: ld returned 1 exit status
+
+It seems that in most cases the compiler removes the relevant functions
+when optimizing. In some cases this does not happen, e.g. here with a PPC
+toolchain.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Makefile.am |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index d200dc3..cc98722 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1003,6 +1003,7 @@ libsystemd_core_la_LIBADD = \
+ 	libsystemd-label.la \
+ 	libsystemd-shared.la \
+ 	libsystemd-dbus.la \
++	libsystemd-id128-internal.la \
+ 	libudev.la \
+ 	$(LIBWRAP_LIBS) \
+ 	$(PAM_LIBS) \
diff --git a/patches/systemd-189/0004-journal-don-t-try-to-compress-without-XZ.patch b/patches/systemd-189/0004-journal-don-t-try-to-compress-without-XZ.patch
new file mode 100644
index 000000000..4212274c4
--- /dev/null
+++ b/patches/systemd-189/0004-journal-don-t-try-to-compress-without-XZ.patch
@@ -0,0 +1,27 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 3 Sep 2012 15:38:37 +0200
+Subject: [PATCH] journal: don't try to compress without XZ
+
+otherwise the header contains the HEADER_INCOMPATIBLE_COMPRESSED
+flag even though the data is not compressed and reading the journal
+fails.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/journal/journal-file.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
+index 79f7598..81ba45c 100644
+--- a/src/journal/journal-file.c
++++ b/src/journal/journal-file.c
+@@ -2007,7 +2007,9 @@ int journal_file_open(
+         f->flags = flags;
+         f->prot = prot_from_flags(flags);
+         f->writable = (flags & O_ACCMODE) != O_RDONLY;
++#ifdef HAVE_XZ
+         f->compress = compress;
++#endif
+         f->seal = seal;
+ 
+         if (mmap_cache)
diff --git a/patches/systemd-189/autogen.sh b/patches/systemd-189/autogen.sh
new file mode 100755
index 000000000..c80035135
--- /dev/null
+++ b/patches/systemd-189/autogen.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# don't recreate configure. Otherwise we would need libgcrypt for
+# AM_PATH_LIBGCRYPT
+aclocal &&
+automake
diff --git a/patches/systemd-189/series b/patches/systemd-189/series
index dbd5de531..d2fff40c0 100644
--- a/patches/systemd-189/series
+++ b/patches/systemd-189/series
@@ -1,2 +1,7 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
 0001-journald-add-missing-includes.patch
 0002-journald-fix-building-with-XZ-support-disabled.patch
+0003-libsystemd-core-needs-libsystemd-id128-internal.patch
+0004-journal-don-t-try-to-compress-without-XZ.patch
+# eacc235884ee4d67122a32c6e69111a1  - git-ptx-patches magic