summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2016-03-30 09:39:34 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-04-19 18:31:56 +0200
commit402f9b973e59dbc42df7a4f1585da30709538c53 (patch)
treec0a65c105926723a2d93dd363407ad8d4e0f69e8 /patches
parent7068ade1d4285246886b1fd07a6c8aadcc735ebb (diff)
downloadptxdist-402f9b973e59dbc42df7a4f1585da30709538c53.tar.gz
ptxdist-402f9b973e59dbc42df7a4f1585da30709538c53.tar.xz
systemd: version bump 228 -> 229
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/systemd-228/0008-btrfs-include-missing.h-before-all-other-local-heade.patch29
-rw-r--r--patches/systemd-229/0001-missing-defined-extra-clock-ids.patch (renamed from patches/systemd-228/0001-missing-defined-extra-clock-ids.patch)4
-rw-r--r--patches/systemd-229/0002-missing-add-BPF_XOR.patch (renamed from patches/systemd-228/0002-missing-add-BPF_XOR.patch)4
-rw-r--r--patches/systemd-229/0003-missing-define-__NR_kcmp-if-necessary.patch (renamed from patches/systemd-228/0003-missing-define-__NR_kcmp-if-necessary.patch)9
-rw-r--r--patches/systemd-229/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch (renamed from patches/systemd-228/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch)21
-rw-r--r--patches/systemd-229/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch (renamed from patches/systemd-228/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch)2
-rw-r--r--patches/systemd-229/0006-missing-define-syncfs.patch (renamed from patches/systemd-228/0006-missing-define-syncfs.patch)8
-rw-r--r--patches/systemd-229/0007-missing-add-more-btrfs-defines.patch (renamed from patches/systemd-228/0007-missing-add-more-btrfs-defines.patch)6
-rw-r--r--patches/systemd-229/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch24
-rw-r--r--patches/systemd-229/0009-HACK-add-local-copy-of-uchar.h.patch152
-rw-r--r--patches/systemd-229/0010-HACK-fix-building-without-linux-sctp.h.patch42
-rw-r--r--patches/systemd-229/0100-basic-user-utils.c-needs-missing.h-for-secure_getenv.patch24
-rwxr-xr-xpatches/systemd-229/autogen.sh (renamed from patches/systemd-228/autogen.sh)0
-rw-r--r--patches/systemd-229/series (renamed from patches/systemd-228/series)9
14 files changed, 282 insertions, 52 deletions
diff --git a/patches/systemd-228/0008-btrfs-include-missing.h-before-all-other-local-heade.patch b/patches/systemd-228/0008-btrfs-include-missing.h-before-all-other-local-heade.patch
deleted file mode 100644
index e4715de98..000000000
--- a/patches/systemd-228/0008-btrfs-include-missing.h-before-all-other-local-heade.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Thu, 19 Nov 2015 16:53:42 +0100
-Subject: [PATCH] btrfs: include missing.h before all other local header files
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/basic/btrfs-util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c
-index be40dc570221..7321de739ab7 100644
---- a/src/basic/btrfs-util.c
-+++ b/src/basic/btrfs-util.c
-@@ -26,6 +26,7 @@
- #include <linux/btrfs.h>
- #endif
-
-+#include "missing.h"
- #include "alloc-util.h"
- #include "btrfs-ctree.h"
- #include "btrfs-util.h"
-@@ -33,7 +34,6 @@
- #include "fd-util.h"
- #include "fileio.h"
- #include "macro.h"
--#include "missing.h"
- #include "path-util.h"
- #include "selinux-util.h"
- #include "smack-util.h"
diff --git a/patches/systemd-228/0001-missing-defined-extra-clock-ids.patch b/patches/systemd-229/0001-missing-defined-extra-clock-ids.patch
index 053d0efa8..618545bea 100644
--- a/patches/systemd-228/0001-missing-defined-extra-clock-ids.patch
+++ b/patches/systemd-229/0001-missing-defined-extra-clock-ids.patch
@@ -12,10 +12,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 10 insertions(+)
diff --git a/src/basic/missing.h b/src/basic/missing.h
-index d539ed00e406..d6dcfc1f449b 100644
+index 36b060496a7b..d73a73f64088 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
-@@ -905,6 +905,16 @@ static inline int setns(int fd, int nstype) {
+@@ -908,6 +908,16 @@ static inline int setns(int fd, int nstype) {
#define RTA_PREF 20
#endif
diff --git a/patches/systemd-228/0002-missing-add-BPF_XOR.patch b/patches/systemd-229/0002-missing-add-BPF_XOR.patch
index d4bbc5979..a2a4a88c9 100644
--- a/patches/systemd-228/0002-missing-add-BPF_XOR.patch
+++ b/patches/systemd-229/0002-missing-add-BPF_XOR.patch
@@ -12,10 +12,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 4 insertions(+)
diff --git a/src/basic/missing.h b/src/basic/missing.h
-index d6dcfc1f449b..461c122ca9c3 100644
+index d73a73f64088..3d9ba1464608 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
-@@ -967,6 +967,10 @@ static inline int setns(int fd, int nstype) {
+@@ -970,6 +970,10 @@ static inline int setns(int fd, int nstype) {
# define BPF_XOR 0xa0
#endif
diff --git a/patches/systemd-228/0003-missing-define-__NR_kcmp-if-necessary.patch b/patches/systemd-229/0003-missing-define-__NR_kcmp-if-necessary.patch
index 32cda724b..e73fb7524 100644
--- a/patches/systemd-228/0003-missing-define-__NR_kcmp-if-necessary.patch
+++ b/patches/systemd-229/0003-missing-define-__NR_kcmp-if-necessary.patch
@@ -8,19 +8,18 @@ Not for upstream, but needed for host-systemd.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
- src/basic/missing.h | 5 +++++
- 1 file changed, 5 insertions(+)
+ src/basic/missing.h | 4 ++++
+ 1 file changed, 4 insertions(+)
diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 461c122ca9c3..5b3093d8a3f6 100644
+index 3d9ba1464608..34af717a7ce8 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
-@@ -1072,6 +1072,11 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
+@@ -1079,6 +1079,10 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
#define RENAME_NOREPLACE (1 << 0)
#endif
+#ifndef __NR_kcmp
-+# warning "__NR_kcmp unknown"
+# define __NR_kcmp 0xffffffff
+#endif
+
diff --git a/patches/systemd-228/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch b/patches/systemd-229/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
index 4db8ce5c2..adfb10e58 100644
--- a/patches/systemd-228/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
+++ b/patches/systemd-229/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
@@ -8,14 +8,15 @@ Upstream requires glibc 2.16 but this is useful for host-systemd.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
- src/basic/missing.h | 6 ++++++
- 1 file changed, 6 insertions(+)
+ src/basic/missing.h | 6 ++++++
+ src/basic/xattr-util.c | 1 +
+ 2 files changed, 7 insertions(+)
diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 5b3093d8a3f6..60d635e91fe2 100644
+index 34af717a7ce8..d17d725116e5 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
-@@ -914,6 +914,12 @@ static inline int setns(int fd, int nstype) {
+@@ -917,6 +917,12 @@ static inline int setns(int fd, int nstype) {
#ifndef CLOCK_BOOTTIME_ALARM
#define CLOCK_BOOTTIME_ALARM 9
#endif
@@ -28,3 +29,15 @@ index 5b3093d8a3f6..60d635e91fe2 100644
#ifndef IPV6_UNICAST_IF
#define IPV6_UNICAST_IF 76
+diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
+index 8d7f14f3827e..dd9d2ebb1155 100644
+--- a/src/basic/xattr-util.c
++++ b/src/basic/xattr-util.c
+@@ -25,6 +25,7 @@
+ #include <sys/time.h>
+ #include <sys/xattr.h>
+
++#include "missing.h"
+ #include "alloc-util.h"
+ #include "fd-util.h"
+ #include "macro.h"
diff --git a/patches/systemd-228/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch b/patches/systemd-229/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch
index 9bff39c6b..c52ea7826 100644
--- a/patches/systemd-228/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch
+++ b/patches/systemd-229/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch
@@ -9,7 +9,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 7 insertions(+)
diff --git a/configure.ac b/configure.ac
-index ec30ff12ae32..2d477700efb0 100644
+index 5fd73c59f15a..507ad1cc0660 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,7 @@ SET_ARCH(IA32, i*86*)
diff --git a/patches/systemd-228/0006-missing-define-syncfs.patch b/patches/systemd-229/0006-missing-define-syncfs.patch
index 057174a59..536fd0c8a 100644
--- a/patches/systemd-228/0006-missing-define-syncfs.patch
+++ b/patches/systemd-229/0006-missing-define-syncfs.patch
@@ -13,7 +13,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
2 files changed, 9 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 2d477700efb0..850e166f8b93 100644
+index 507ad1cc0660..c998f6848d47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -302,6 +302,8 @@ CAP_LIBS="$LIBS"
@@ -24,12 +24,12 @@ index 2d477700efb0..850e166f8b93 100644
+
AC_CHECK_FUNCS([memfd_create])
AC_CHECK_FUNCS([__secure_getenv secure_getenv])
- AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2, kcmp, keyctl, key_serial_t, LO_FLAGS_PARTSCAN],
+ AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2,
diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 60d635e91fe2..c4d9505d38f1 100644
+index d17d725116e5..c64131da01c7 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
-@@ -920,6 +920,13 @@ static inline int setns(int fd, int nstype) {
+@@ -923,6 +923,13 @@ static inline int setns(int fd, int nstype) {
#ifndef AT_EMPTY_PATH
#define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname */
#endif
diff --git a/patches/systemd-228/0007-missing-add-more-btrfs-defines.patch b/patches/systemd-229/0007-missing-add-more-btrfs-defines.patch
index 100e407e1..0d85b804a 100644
--- a/patches/systemd-228/0007-missing-add-more-btrfs-defines.patch
+++ b/patches/systemd-229/0007-missing-add-more-btrfs-defines.patch
@@ -8,10 +8,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 41 insertions(+)
diff --git a/src/basic/missing.h b/src/basic/missing.h
-index c4d9505d38f1..78bbd9558ac1 100644
+index c64131da01c7..31fe1c5d44a7 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
-@@ -384,6 +384,23 @@ struct btrfs_ioctl_quota_ctl_args {
+@@ -387,6 +387,23 @@ struct btrfs_ioctl_quota_ctl_args {
__u64 cmd;
__u64 status;
};
@@ -35,7 +35,7 @@ index c4d9505d38f1..78bbd9558ac1 100644
#endif
#ifndef BTRFS_IOC_DEFRAG
-@@ -458,11 +475,35 @@ struct btrfs_ioctl_quota_ctl_args {
+@@ -461,11 +478,35 @@ struct btrfs_ioctl_quota_ctl_args {
struct btrfs_ioctl_quota_ctl_args)
#endif
diff --git a/patches/systemd-229/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch b/patches/systemd-229/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch
new file mode 100644
index 000000000..f75dd8613
--- /dev/null
+++ b/patches/systemd-229/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch
@@ -0,0 +1,24 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 19 Nov 2015 16:53:42 +0100
+Subject: [PATCH] HACK: include missing.h in btrfs-ctree.h for BTRFS_UUID_SIZE
+
+This is needed for older Kernel headers without btrfs.h
+
+Not for upstream, but needed for host-systemd.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/basic/btrfs-ctree.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/basic/btrfs-ctree.h b/src/basic/btrfs-ctree.h
+index 66bdf9736ef5..e9edc8eb5445 100644
+--- a/src/basic/btrfs-ctree.h
++++ b/src/basic/btrfs-ctree.h
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include "missing.h"
+ #include "macro.h"
+ #include "sparse-endian.h"
+
diff --git a/patches/systemd-229/0009-HACK-add-local-copy-of-uchar.h.patch b/patches/systemd-229/0009-HACK-add-local-copy-of-uchar.h.patch
new file mode 100644
index 000000000..77dd2419b
--- /dev/null
+++ b/patches/systemd-229/0009-HACK-add-local-copy-of-uchar.h.patch
@@ -0,0 +1,152 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Fri, 15 Apr 2016 16:33:14 +0200
+Subject: [PATCH] HACK: add local copy of uchar.h
+
+Upstream requires glibc 2.16 and uchar.h is available in that version.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.ac | 1 +
+ src/basic/_uchar.h | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/basic/escape.h | 1 -
+ src/basic/missing.h | 4 +++
+ src/basic/utf8.h | 1 -
+ 5 files changed, 83 insertions(+), 2 deletions(-)
+ create mode 100644 src/basic/_uchar.h
+
+diff --git a/configure.ac b/configure.ac
+index c998f6848d47..e78ed97a8b7c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -291,6 +291,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
+ AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
+ AC_CHECK_HEADERS([linux/btrfs.h], [], [])
+ AC_CHECK_HEADERS([linux/memfd.h], [], [])
++AC_CHECK_HEADERS([uchar.h], [], [])
+
+ # unconditionally pull-in librt with old glibc versions
+ AC_SEARCH_LIBS([clock_gettime], [rt], [], [])
+diff --git a/src/basic/_uchar.h b/src/basic/_uchar.h
+new file mode 100644
+index 000000000000..b15d355ae0c5
+--- /dev/null
++++ b/src/basic/_uchar.h
+@@ -0,0 +1,78 @@
++/* Copyright (C) 2011-2015 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
++/*
++ * ISO C11 Standard: 7.28
++ * Unicode utilities <uchar.h>
++ */
++
++#ifndef _UCHAR_H
++#define _UCHAR_H 1
++
++#include <features.h>
++
++#define __need_size_t
++#include <stddef.h>
++#define __need_mbstate_t
++#include <wchar.h>
++
++/* Public type. */
++typedef __mbstate_t mbstate_t;
++
++
++#if defined __GNUC__ && !defined __USE_ISOCXX11
++/* Define the 16-bit and 32-bit character types. Use the information
++ provided by the compiler. */
++# if !defined __CHAR16_TYPE__ || !defined __CHAR32_TYPE__
++# if defined __STDC_VERSION__ && __STDC_VERSION__ < 201000L
++# error "<uchar.h> requires ISO C11 mode"
++# else
++# error "definitions of __CHAR16_TYPE__ and/or __CHAR32_TYPE__ missing"
++# endif
++# endif
++typedef __CHAR16_TYPE__ char16_t;
++typedef __CHAR32_TYPE__ char32_t;
++#endif
++
++
++__BEGIN_DECLS
++
++/* Write char16_t representation of multibyte character pointed
++ to by S to PC16. */
++extern size_t mbrtoc16 (char16_t *__restrict __pc16,
++ const char *__restrict __s, size_t __n,
++ mbstate_t *__restrict __p) __THROW;
++
++/* Write multibyte representation of char16_t C16 to S. */
++extern size_t c16rtomb (char *__restrict __s, char16_t __c16,
++ mbstate_t *__restrict __ps) __THROW;
++
++
++
++/* Write char32_t representation of multibyte character pointed
++ to by S to PC32. */
++extern size_t mbrtoc32 (char32_t *__restrict __pc32,
++ const char *__restrict __s, size_t __n,
++ mbstate_t *__restrict __p) __THROW;
++
++/* Write multibyte representation of char32_t C32 to S. */
++extern size_t c32rtomb (char *__restrict __s, char32_t __c32,
++ mbstate_t *__restrict __ps) __THROW;
++
++__END_DECLS
++
++#endif /* uchar.h */
+diff --git a/src/basic/escape.h b/src/basic/escape.h
+index 1b28bd10afc2..007e9df8015d 100644
+--- a/src/basic/escape.h
++++ b/src/basic/escape.h
+@@ -23,7 +23,6 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <sys/types.h>
+-#include <uchar.h>
+
+ #include "string-util.h"
+ #include "missing.h"
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index 31fe1c5d44a7..ff370fea99d1 100644
+--- a/src/basic/missing.h
++++ b/src/basic/missing.h
+@@ -34,7 +34,11 @@
+ #include <stdlib.h>
+ #include <sys/resource.h>
+ #include <sys/syscall.h>
++#ifdef HAVE_UCHAR_H
+ #include <uchar.h>
++#else
++#include "_uchar.h"
++#endif
+ #include <unistd.h>
+
+ #ifdef HAVE_AUDIT
+diff --git a/src/basic/utf8.h b/src/basic/utf8.h
+index 12c272d66e35..bea93a64437e 100644
+--- a/src/basic/utf8.h
++++ b/src/basic/utf8.h
+@@ -22,7 +22,6 @@
+ #include <stdbool.h>
+ #include <stddef.h>
+ #include <stdint.h>
+-#include <uchar.h>
+
+ #include "macro.h"
+ #include "missing.h"
diff --git a/patches/systemd-229/0010-HACK-fix-building-without-linux-sctp.h.patch b/patches/systemd-229/0010-HACK-fix-building-without-linux-sctp.h.patch
new file mode 100644
index 000000000..2b61ba4e8
--- /dev/null
+++ b/patches/systemd-229/0010-HACK-fix-building-without-linux-sctp.h.patch
@@ -0,0 +1,42 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 18 Apr 2016 12:22:22 +0200
+Subject: [PATCH] HACK: fix building without linux/sctp.h
+
+linux/sctp.h exists since kernel 3.10.
+
+Upstream requires kernel 3.11 but this is useful for host-systemd.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.ac | 1 +
+ src/core/socket.c | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index e78ed97a8b7c..733109747b07 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -292,6 +292,7 @@ AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers n
+ AC_CHECK_HEADERS([linux/btrfs.h], [], [])
+ AC_CHECK_HEADERS([linux/memfd.h], [], [])
+ AC_CHECK_HEADERS([uchar.h], [], [])
++AC_CHECK_HEADERS([linux/sctp.h], [], [])
+
+ # unconditionally pull-in librt with old glibc versions
+ AC_SEARCH_LIBS([clock_gettime], [rt], [], [])
+diff --git a/src/core/socket.c b/src/core/socket.c
+index 976687af416d..9ebbb6378cb0 100644
+--- a/src/core/socket.c
++++ b/src/core/socket.c
+@@ -26,7 +26,11 @@
+ #include <sys/epoll.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#ifdef HAVE_LINUX_SCTP_H
+ #include <linux/sctp.h>
++#else
++#define SCTP_NODELAY 3
++#endif
+
+ #include "sd-event.h"
+ #include "alloc-util.h"
diff --git a/patches/systemd-229/0100-basic-user-utils.c-needs-missing.h-for-secure_getenv.patch b/patches/systemd-229/0100-basic-user-utils.c-needs-missing.h-for-secure_getenv.patch
new file mode 100644
index 000000000..fbf753df0
--- /dev/null
+++ b/patches/systemd-229/0100-basic-user-utils.c-needs-missing.h-for-secure_getenv.patch
@@ -0,0 +1,24 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Fri, 15 Apr 2016 16:43:02 +0200
+Subject: [PATCH] basic: user-utils.c needs missing.h for secure_getenv
+
+Otherwise building may fail with:
+
+src/basic/user-util.c: In function 'get_home_dir':
+src/basic/user-util.c:343:9: error: implicit declaration of function 'secure_getenv' [-Werror=implicit-function-declaration]
+---
+ src/basic/user-util.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/basic/user-util.c b/src/basic/user-util.c
+index 19155bce5364..f65ca3edaa28 100644
+--- a/src/basic/user-util.c
++++ b/src/basic/user-util.c
+@@ -30,6 +30,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
++#include "missing.h"
+ #include "alloc-util.h"
+ #include "fd-util.h"
+ #include "formats-util.h"
diff --git a/patches/systemd-228/autogen.sh b/patches/systemd-229/autogen.sh
index cbfab1ee7..cbfab1ee7 100755
--- a/patches/systemd-228/autogen.sh
+++ b/patches/systemd-229/autogen.sh
diff --git a/patches/systemd-228/series b/patches/systemd-229/series
index f56ff69dc..dac126c74 100644
--- a/patches/systemd-228/series
+++ b/patches/systemd-229/series
@@ -1,5 +1,6 @@
# generated by git-ptx-patches
#tag:base --start-number 1
+#tag:host-systemd --start-number 1
0001-missing-defined-extra-clock-ids.patch
0002-missing-add-BPF_XOR.patch
0003-missing-define-__NR_kcmp-if-necessary.patch
@@ -7,5 +8,9 @@
0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch
0006-missing-define-syncfs.patch
0007-missing-add-more-btrfs-defines.patch
-0008-btrfs-include-missing.h-before-all-other-local-heade.patch
-# f87f96a66360b4e47b2b2f0452ddd79b - git-ptx-patches magic
+0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch
+0009-HACK-add-local-copy-of-uchar.h.patch
+0010-HACK-fix-building-without-linux-sctp.h.patch
+#tag:upstream --start-number 100
+0100-basic-user-utils.c-needs-missing.h-for-secure_getenv.patch
+# dd2b53d96b8d4daf6822fc2a3324bc5b - git-ptx-patches magic