systemd: add more host-systemd fixes

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

4 files changed, 127 insertions, 1 deletions

diff --git a/patches/systemd-220/0006-random-util-guard-including-sys-auxv.h-with-the-corr.patch b/patches/systemd-220/0006-random-util-guard-including-sys-auxv.h-with-the-corr.patch
new file mode 100644
index 000000000..abff14983
--- /dev/null
+++ b/patches/systemd-220/0006-random-util-guard-including-sys-auxv.h-with-the-corr.patch
@@ -0,0 +1,24 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 2 Jun 2015 10:41:24 +0200
+Subject: [PATCH] random-util: guard including sys/auxv.h with the
+ corresponding ifdef check
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/shared/random-util.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/shared/random-util.c b/src/shared/random-util.c
+index 88f5182508e7..b230044f5099 100644
+--- a/src/shared/random-util.c
++++ b/src/shared/random-util.c
+@@ -23,7 +23,9 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <time.h>
++#ifdef HAVE_SYS_AUXV_H
+ #include <sys/auxv.h>
++#endif
+ #include <linux/random.h>
+ 
+ #include "random-util.h"
diff --git a/patches/systemd-220/0007-missing-add-more-btrfs-defines.patch b/patches/systemd-220/0007-missing-add-more-btrfs-defines.patch
new file mode 100644
index 000000000..02074091f
--- /dev/null
+++ b/patches/systemd-220/0007-missing-add-more-btrfs-defines.patch
@@ -0,0 +1,69 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 2 Jun 2015 10:42:10 +0200
+Subject: [PATCH] missing: add more btrfs defines
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/shared/missing.h | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/src/shared/missing.h b/src/shared/missing.h
+index b7c001ffd8d3..02dbb8628a6c 100644
+--- a/src/shared/missing.h
++++ b/src/shared/missing.h
+@@ -269,6 +269,11 @@ struct btrfs_qgroup_inherit {
+         __u64 qgroups[0];
+ };
+ 
++struct btrfs_ioctl_qgroup_limit_args {
++        __u64 qgroupid;
++        struct btrfs_qgroup_limit lim;
++};
++
+ struct btrfs_ioctl_vol_args_v2 {
+         __s64 fd;
+         __u64 transid;
+@@ -360,6 +365,14 @@ struct btrfs_ioctl_clone_range_args {
+         __u64 src_offset, src_length;
+         __u64 dest_offset;
+ };
++
++#define BTRFS_QUOTA_CTL_ENABLE  1
++#define BTRFS_QUOTA_CTL_DISABLE 2
++#define BTRFS_QUOTA_CTL_RESCAN__NOTUSED 3
++struct btrfs_ioctl_quota_ctl_args {
++        __u64 cmd;
++        __u64 status;
++};
+ #endif
+ 
+ #ifndef BTRFS_IOC_DEFRAG
+@@ -367,6 +380,11 @@ struct btrfs_ioctl_clone_range_args {
+                                  struct btrfs_ioctl_vol_args)
+ #endif
+ 
++#ifndef BTRFS_IOC_RESIZE
++#define BTRFS_IOC_RESIZE _IOW(BTRFS_IOCTL_MAGIC, 3, \
++                                 struct btrfs_ioctl_vol_args)
++#endif
++
+ #ifndef BTRFS_IOC_CLONE
+ #define BTRFS_IOC_CLONE _IOW(BTRFS_IOCTL_MAGIC, 9, int)
+ #endif
+@@ -424,6 +442,16 @@ struct btrfs_ioctl_clone_range_args {
+                                  struct btrfs_ioctl_vol_args)
+ #endif
+ 
++#ifndef BTRFS_IOC_QUOTA_CTL
++#define BTRFS_IOC_QUOTA_CTL _IOWR(BTRFS_IOCTL_MAGIC, 40, \
++                               struct btrfs_ioctl_quota_ctl_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_FIRST_FREE_OBJECTID
+ #define BTRFS_FIRST_FREE_OBJECTID 256
+ #endif
diff --git a/patches/systemd-220/0008-missing-define-O_PATH-and-AT_EMPTY_PATH.patch b/patches/systemd-220/0008-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
new file mode 100644
index 000000000..e5bc676bf
--- /dev/null
+++ b/patches/systemd-220/0008-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
@@ -0,0 +1,30 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 2 Jun 2015 10:46:05 +0200
+Subject: [PATCH] missing: define O_PATH and AT_EMPTY_PATH
+
+This is required for glibc <= 2.15
+
+Upstream requires glibc 2.16 but this is useful for host-systemd.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/shared/missing.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/shared/missing.h b/src/shared/missing.h
+index 02dbb8628a6c..5574386a0628 100644
+--- a/src/shared/missing.h
++++ b/src/shared/missing.h
+@@ -838,6 +838,12 @@ static inline int setns(int fd, int nstype) {
+ #ifndef CLOCK_BOOTTIME_ALARM
+ #define CLOCK_BOOTTIME_ALARM 9
+ #endif
++#ifndef O_PATH
++#define O_PATH		010000000
++#endif
++#ifndef AT_EMPTY_PATH
++#define AT_EMPTY_PATH	0x1000	/* Allow empty relative pathname */
++#endif
+ 
+ #ifndef IPV6_UNICAST_IF
+ #define IPV6_UNICAST_IF 76
diff --git a/patches/systemd-220/series b/patches/systemd-220/series
index 0db4f6ad0..f82220a34 100644
--- a/patches/systemd-220/series
+++ b/patches/systemd-220/series
@@ -5,4 +5,7 @@
 0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
 0004-missing-define-__NR_kcmp-if-necessary.patch
 0005-HACK-missing-add-mor-IFLA_VXLAN_-defines.patch
-# 5962e81539803e398eac36196071908d  - git-ptx-patches magic
+0006-random-util-guard-including-sys-auxv.h-with-the-corr.patch
+0007-missing-add-more-btrfs-defines.patch
+0008-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
+# 1fd3037015140a7bf9cd2891f4878b07  - git-ptx-patches magic