systemd: version bump 227 -> 228

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

12 files changed, 128 insertions, 59 deletions

diff --git a/patches/systemd-227/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch b/patches/systemd-227/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
deleted file mode 100644
index fabd720ce..000000000
--- a/patches/systemd-227/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 12 Jan 2015 14:14:42 +0100
-Subject: [PATCH] HACK: sd-pppoe: don't use linux/ppp-ioctl.h
-
-This is required for glibc <= 2.13
-
-Upstream requires glibc 2.14 but this is useful for host-systemd.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/libsystemd-network/sd-pppoe.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libsystemd-network/sd-pppoe.c b/src/libsystemd-network/sd-pppoe.c
-index cd5a204f8c61..59c6b0917490 100644
---- a/src/libsystemd-network/sd-pppoe.c
-+++ b/src/libsystemd-network/sd-pppoe.c
-@@ -23,7 +23,6 @@
- 
- #include <sys/ioctl.h>
- #include <linux/ppp_defs.h>
--#include <linux/ppp-ioctl.h>
- #include <net/if.h>
- #include <netinet/in.h>
- #include <linux/if_pppox.h>
-@@ -38,6 +37,8 @@
- #include "async.h"
- #include "utf8.h"
- 
-+#define PPPIOCGCHAN	_IOR('t', 55, int)	/* get ppp channel number */
-+
- #define PPPOE_MAX_PACKET_SIZE 1484
- #define PPPOE_MAX_PADR_RESEND 16
- 
diff --git a/patches/systemd-227/series b/patches/systemd-227/series
deleted file mode 100644
index 2763f97f5..000000000
--- a/patches/systemd-227/series
+++ /dev/null
@@ -1,10 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-missing-defined-extra-clock-ids.patch
-0002-missing-add-BPF_XOR.patch
-0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
-0004-missing-define-__NR_kcmp-if-necessary.patch
-0005-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
-0006-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch
-0007-missing-define-syncfs.patch
-# a5c53790b7dcb6f084d3a6f7a623f070  - git-ptx-patches magic
diff --git a/patches/systemd-227/0001-missing-defined-extra-clock-ids.patch b/patches/systemd-228/0001-missing-defined-extra-clock-ids.patch
index dd1e011f2..053d0efa8 100644
--- a/patches/systemd-227/0001-missing-defined-extra-clock-ids.patch
+++ b/patches/systemd-228/0001-missing-defined-extra-clock-ids.patch
@@ -12,11 +12,11 @@ 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 59e835a4664b..7ddd56d92149 100644
+index d539ed00e406..d6dcfc1f449b 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -888,6 +888,16 @@ static inline int setns(int fd, int nstype) {
- #define NDA_MAX (__NDA_MAX - 1)
+@@ -905,6 +905,16 @@ static inline int setns(int fd, int nstype) {
+ #define RTA_PREF 20
  #endif
  
 +#ifndef CLOCK_BOOTTIME
diff --git a/patches/systemd-227/0002-missing-add-BPF_XOR.patch b/patches/systemd-228/0002-missing-add-BPF_XOR.patch
index c4b3becda..d4bbc5979 100644
--- a/patches/systemd-227/0002-missing-add-BPF_XOR.patch
+++ b/patches/systemd-228/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 7ddd56d92149..4bf02db7adce 100644
+index d6dcfc1f449b..461c122ca9c3 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -950,6 +950,10 @@ static inline int setns(int fd, int nstype) {
+@@ -967,6 +967,10 @@ static inline int setns(int fd, int nstype) {
  #  define BPF_XOR 0xa0
  #endif
  
diff --git a/patches/systemd-227/0004-missing-define-__NR_kcmp-if-necessary.patch b/patches/systemd-228/0003-missing-define-__NR_kcmp-if-necessary.patch
index f3c375c36..32cda724b 100644
--- a/patches/systemd-227/0004-missing-define-__NR_kcmp-if-necessary.patch
+++ b/patches/systemd-228/0003-missing-define-__NR_kcmp-if-necessary.patch
@@ -12,10 +12,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 5 insertions(+)
 
 diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 4bf02db7adce..fc901bede511 100644
+index 461c122ca9c3..5b3093d8a3f6 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -1055,6 +1055,11 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
+@@ -1072,6 +1072,11 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
  #define RENAME_NOREPLACE (1 << 0)
  #endif
  
diff --git a/patches/systemd-227/0005-missing-define-O_PATH-and-AT_EMPTY_PATH.patch b/patches/systemd-228/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
index f61333c6a..4db8ce5c2 100644
--- a/patches/systemd-227/0005-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
+++ b/patches/systemd-228/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
@@ -12,10 +12,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 6 insertions(+)
 
 diff --git a/src/basic/missing.h b/src/basic/missing.h
-index fc901bede511..0efbf64ac2c7 100644
+index 5b3093d8a3f6..60d635e91fe2 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -897,6 +897,12 @@ static inline int setns(int fd, int nstype) {
+@@ -914,6 +914,12 @@ static inline int setns(int fd, int nstype) {
  #ifndef CLOCK_BOOTTIME_ALARM
  #define CLOCK_BOOTTIME_ALARM 9
  #endif
diff --git a/patches/systemd-227/0006-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch b/patches/systemd-228/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch
index 8a65471e2..9bff39c6b 100644
--- a/patches/systemd-227/0006-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch
+++ b/patches/systemd-228/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 5e3cdd6d2bfd..b6dc5db75418 100644
+index ec30ff12ae32..2d477700efb0 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -59,6 +59,7 @@ SET_ARCH(IA32, i*86*)
diff --git a/patches/systemd-227/0007-missing-define-syncfs.patch b/patches/systemd-228/0006-missing-define-syncfs.patch
index 113ef8e2f..057174a59 100644
--- a/patches/systemd-227/0007-missing-define-syncfs.patch
+++ b/patches/systemd-228/0006-missing-define-syncfs.patch
@@ -13,11 +13,11 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  2 files changed, 9 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index b6dc5db75418..c3f835bfceef 100644
+index 2d477700efb0..850e166f8b93 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -303,6 +303,8 @@ AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not
- CAP_LIBS="$LIBS"
+@@ -302,6 +302,8 @@ CAP_LIBS="$LIBS"
+ LIBS="$save_LIBS"
  AC_SUBST(CAP_LIBS)
  
 +AC_CHECK_DECLS([syncfs], [], [], [[#include <unistd.h>]])
@@ -26,10 +26,10 @@ index b6dc5db75418..c3f835bfceef 100644
  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],
 diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 0efbf64ac2c7..949688298f20 100644
+index 60d635e91fe2..c4d9505d38f1 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -903,6 +903,13 @@ static inline int setns(int fd, int nstype) {
+@@ -920,6 +920,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-228/0007-missing-add-more-btrfs-defines.patch
new file mode 100644
index 000000000..100e407e1
--- /dev/null
+++ b/patches/systemd-228/0007-missing-add-more-btrfs-defines.patch
@@ -0,0 +1,73 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 19 Nov 2015 16:52:47 +0100
+Subject: [PATCH] missing: add more btrfs defines
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/basic/missing.h | 41 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 41 insertions(+)
+
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index c4d9505d38f1..78bbd9558ac1 100644
+--- a/src/basic/missing.h
++++ b/src/basic/missing.h
+@@ -384,6 +384,23 @@ struct btrfs_ioctl_quota_ctl_args {
+         __u64 cmd;
+         __u64 status;
+ };
++
++struct btrfs_ioctl_quota_rescan_args {
++        __u64 flags;
++        __u64 progress;
++        __u64 reserved[6];
++};
++
++struct btrfs_ioctl_qgroup_assign_args {
++        __u64 assign;
++        __u64 src;
++        __u64 dst;
++};
++
++struct btrfs_ioctl_qgroup_create_args {
++        __u64 create;
++        __u64 qgroupid;
++};
+ #endif
+ 
+ #ifndef BTRFS_IOC_DEFRAG
+@@ -458,11 +475,35 @@ struct btrfs_ioctl_quota_ctl_args {
+                                struct btrfs_ioctl_quota_ctl_args)
+ #endif
+ 
++#ifndef BTRFS_IOC_QGROUP_ASSIGN
++#define BTRFS_IOC_QGROUP_ASSIGN _IOW(BTRFS_IOCTL_MAGIC, 41, \
++                               struct btrfs_ioctl_qgroup_assign_args)
++#endif
++
++#ifndef BTRFS_IOC_QGROUP_CREATE
++#define BTRFS_IOC_QGROUP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 42, \
++                               struct btrfs_ioctl_qgroup_create_args)
++#endif
++
+ #ifndef BTRFS_IOC_QGROUP_LIMIT
+ #define BTRFS_IOC_QGROUP_LIMIT _IOR(BTRFS_IOCTL_MAGIC, 43, \
+                                struct btrfs_ioctl_qgroup_limit_args)
+ #endif
+ 
++#ifndef BTRFS_IOC_QUOTA_RESCAN
++#define BTRFS_IOC_QUOTA_RESCAN _IOW(BTRFS_IOCTL_MAGIC, 44, \
++                               struct btrfs_ioctl_quota_rescan_args)
++#endif
++
++#ifndef BTRFS_IOC_QUOTA_RESCAN_STATUS
++#define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \
++                               struct btrfs_ioctl_quota_rescan_args)
++#endif
++
++#ifndef BTRFS_IOC_QUOTA_RESCAN_WAIT
++#define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46)
++#endif
++
+ #ifndef BTRFS_FIRST_FREE_OBJECTID
+ #define BTRFS_FIRST_FREE_OBJECTID 256
+ #endif
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
new file mode 100644
index 000000000..e4715de98
--- /dev/null
+++ b/patches/systemd-228/0008-btrfs-include-missing.h-before-all-other-local-heade.patch
@@ -0,0 +1,29 @@
+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-227/autogen.sh b/patches/systemd-228/autogen.sh
index cbfab1ee7..cbfab1ee7 100755
--- a/patches/systemd-227/autogen.sh
+++ b/patches/systemd-228/autogen.sh
diff --git a/patches/systemd-228/series b/patches/systemd-228/series
new file mode 100644
index 000000000..f56ff69dc
--- /dev/null
+++ b/patches/systemd-228/series
@@ -0,0 +1,11 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-missing-defined-extra-clock-ids.patch
+0002-missing-add-BPF_XOR.patch
+0003-missing-define-__NR_kcmp-if-necessary.patch
+0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
+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