systemd: version bump 193 -> 194

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

5 files changed, 57 insertions, 2 deletions

diff --git a/patches/systemd-194/0001-check-for-name_to_handle_at-declaration-instead-of-i.patch b/patches/systemd-194/0001-check-for-name_to_handle_at-declaration-instead-of-i.patch
new file mode 100644
index 000000000..85aacac1f
--- /dev/null
+++ b/patches/systemd-194/0001-check-for-name_to_handle_at-declaration-instead-of-i.patch
@@ -0,0 +1,47 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 8 Oct 2012 08:42:52 +0200
+Subject: [PATCH] check for name_to_handle_at declaration instead of its
+ definition
+
+AC_CHECK_FUNCS may be successful, even though name_to_handle_at and
+'struct file_handle'  are not available.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.ac         |    7 ++++---
+ src/shared/missing.h |    2 +-
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5d7d0c2..b543dbc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -172,11 +172,12 @@ CAP_LIBS="$LIBS"
+ LIBS="$save_LIBS"
+ AC_SUBST(CAP_LIBS)
+ 
+-AC_CHECK_FUNCS([fanotify_init fanotify_mark name_to_handle_at])
++AC_CHECK_FUNCS([fanotify_init fanotify_mark])
+ AC_CHECK_FUNCS([__secure_getenv secure_getenv])
+-AC_CHECK_DECLS([gettid, pivot_root], [], [], [[#include <sys/types.h>
++AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at], [], [], [[#include <sys/types.h>
+ #include <unistd.h>
+-#include <sys/mount.h>]])
++#include <sys/mount.h>
++#include <fcntl.h>]])
+ 
+ # This makes sure pkg.m4 is available.
+ m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
+diff --git a/src/shared/missing.h b/src/shared/missing.h
+index 14abe4e..de68327 100644
+--- a/src/shared/missing.h
++++ b/src/shared/missing.h
+@@ -218,7 +218,7 @@ static inline pid_t gettid(void) {
+ #  endif
+ #endif
+ 
+-#ifndef HAVE_NAME_TO_HANDLE_AT
++#if !HAVE_DECL_NAME_TO_HANDLE_AT
+ struct file_handle {
+         unsigned int handle_bytes;
+         int handle_type;
diff --git a/patches/systemd-194/autogen.sh b/patches/systemd-194/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/systemd-194/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/systemd-194/series b/patches/systemd-194/series
new file mode 100644
index 000000000..64c625ffb
--- /dev/null
+++ b/patches/systemd-194/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-check-for-name_to_handle_at-declaration-instead-of-i.patch
+# 27884b55b2a65335a27300a6b0cad3bd  - git-ptx-patches magic
diff --git a/rules/systemd.in b/rules/systemd.in
index f5ea8b297..1a0897d93 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -2,6 +2,9 @@
 
 menuconfig SYSTEMD
 	tristate
+	# for autogen.sh
+	select HOST_LIBGCRYPT
+
 	select HOST_INTLTOOL
 	select HOST_GPERF
 	select ROOTFS_RUN
diff --git a/rules/systemd.make b/rules/systemd.make
index bbd5e06f2..f0664b9fc 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd
 #
 # Paths and names
 #
-SYSTEMD_VERSION	:= 193
-SYSTEMD_MD5	:= 732a9de2b1d2a15cab639c987ff9e90e
+SYSTEMD_VERSION	:= 194
+SYSTEMD_MD5	:= 0ebb73aea444693b9b86f7a76f5df23c
 SYSTEMD		:= systemd-$(SYSTEMD_VERSION)
 SYSTEMD_SUFFIX	:= tar.xz
 SYSTEMD_URL	:= http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX)