diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-27 07:02:57 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-27 20:27:53 +0200 |
commit | 3372401230ec4235f73b384d0a0e562e342fdcc9 (patch) | |
tree | 84a069adab1ca44bb660ae88c160c7d5bd147699 | |
parent | 18a6d084e4dac0d9832011b90fa45e112bf61f08 (diff) | |
download | ptxdist-3372401230ec4235f73b384d0a0e562e342fdcc9.tar.gz ptxdist-3372401230ec4235f73b384d0a0e562e342fdcc9.tar.xz |
systemd: version bump 229 -> 230
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/systemd-229/0100-basic-user-utils.c-needs-missing.h-for-secure_getenv.patch | 24 | ||||
-rw-r--r-- | patches/systemd-230/0001-missing-defined-extra-clock-ids.patch (renamed from patches/systemd-229/0001-missing-defined-extra-clock-ids.patch) | 4 | ||||
-rw-r--r-- | patches/systemd-230/0002-missing-add-BPF_XOR.patch (renamed from patches/systemd-229/0002-missing-add-BPF_XOR.patch) | 4 | ||||
-rw-r--r-- | patches/systemd-230/0003-missing-define-__NR_kcmp-if-necessary.patch (renamed from patches/systemd-229/0003-missing-define-__NR_kcmp-if-necessary.patch) | 18 | ||||
-rw-r--r-- | patches/systemd-230/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch (renamed from patches/systemd-229/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch) | 15 | ||||
-rw-r--r-- | patches/systemd-230/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch (renamed from patches/systemd-229/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch) | 2 | ||||
-rw-r--r-- | patches/systemd-230/0006-missing-define-syncfs.patch (renamed from patches/systemd-229/0006-missing-define-syncfs.patch) | 32 | ||||
-rw-r--r-- | patches/systemd-230/0007-missing-add-more-btrfs-defines.patch (renamed from patches/systemd-229/0007-missing-add-more-btrfs-defines.patch) | 18 | ||||
-rw-r--r-- | patches/systemd-230/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch (renamed from patches/systemd-229/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch) | 0 | ||||
-rw-r--r-- | patches/systemd-230/0009-HACK-add-local-copy-of-uchar.h.patch (renamed from patches/systemd-229/0009-HACK-add-local-copy-of-uchar.h.patch) | 10 | ||||
-rw-r--r-- | patches/systemd-230/0010-HACK-fix-building-without-linux-sctp.h.patch (renamed from patches/systemd-229/0010-HACK-fix-building-without-linux-sctp.h.patch) | 6 | ||||
-rw-r--r-- | patches/systemd-230/0011-missing-add-SMACK_MAGIC-EFIVARFS_MAGIC-BINFMTFS_MAGI.patch | 34 | ||||
-rwxr-xr-x | patches/systemd-230/autogen.sh (renamed from patches/systemd-229/autogen.sh) | 0 | ||||
-rw-r--r-- | patches/systemd-230/series (renamed from patches/systemd-229/series) | 4 | ||||
-rw-r--r-- | rules/host-systemd.make | 5 | ||||
-rw-r--r-- | rules/systemd.make | 15 |
16 files changed, 98 insertions, 93 deletions
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 deleted file mode 100644 index fbf753df0..000000000 --- a/patches/systemd-229/0100-basic-user-utils.c-needs-missing.h-for-secure_getenv.patch +++ /dev/null @@ -1,24 +0,0 @@ -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-229/0001-missing-defined-extra-clock-ids.patch b/patches/systemd-230/0001-missing-defined-extra-clock-ids.patch index 618545bea..9a8dc7d82 100644 --- a/patches/systemd-229/0001-missing-defined-extra-clock-ids.patch +++ b/patches/systemd-230/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 36b060496a7b..d73a73f64088 100644 +index 651e41439511..e5554c6e1a22 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h -@@ -908,6 +908,16 @@ static inline int setns(int fd, int nstype) { +@@ -832,6 +832,16 @@ struct btrfs_ioctl_quota_ctl_args { #define RTA_PREF 20 #endif diff --git a/patches/systemd-229/0002-missing-add-BPF_XOR.patch b/patches/systemd-230/0002-missing-add-BPF_XOR.patch index a2a4a88c9..af49ef7ac 100644 --- a/patches/systemd-229/0002-missing-add-BPF_XOR.patch +++ b/patches/systemd-230/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 d73a73f64088..3d9ba1464608 100644 +index e5554c6e1a22..5f7d9c65d816 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h -@@ -970,6 +970,10 @@ static inline int setns(int fd, int nstype) { +@@ -898,6 +898,10 @@ struct btrfs_ioctl_quota_ctl_args { # define BPF_XOR 0xa0 #endif diff --git a/patches/systemd-229/0003-missing-define-__NR_kcmp-if-necessary.patch b/patches/systemd-230/0003-missing-define-__NR_kcmp-if-necessary.patch index e73fb7524..871ea1d43 100644 --- a/patches/systemd-229/0003-missing-define-__NR_kcmp-if-necessary.patch +++ b/patches/systemd-230/0003-missing-define-__NR_kcmp-if-necessary.patch @@ -8,16 +8,16 @@ Not for upstream, but needed for host-systemd. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - src/basic/missing.h | 4 ++++ + src/basic/missing_syscall.h | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/src/basic/missing.h b/src/basic/missing.h -index 3d9ba1464608..34af717a7ce8 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -1079,6 +1079,10 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha - #define RENAME_NOREPLACE (1 << 0) - #endif +diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h +index d502d3b9cad8..83c60d804531 100644 +--- a/src/basic/missing_syscall.h ++++ b/src/basic/missing_syscall.h +@@ -235,6 +235,10 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha + + /* ======================================================================= */ +#ifndef __NR_kcmp +# define __NR_kcmp 0xffffffff @@ -25,4 +25,4 @@ index 3d9ba1464608..34af717a7ce8 100644 + #if !HAVE_DECL_KCMP static inline int kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { - #if defined(__NR_kcmp) + # ifdef __NR_kcmp diff --git a/patches/systemd-229/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch b/patches/systemd-230/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch index adfb10e58..f0757cc9b 100644 --- a/patches/systemd-229/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch +++ b/patches/systemd-230/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch @@ -8,29 +8,30 @@ 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 ++++++ + src/basic/missing.h | 7 +++++++ src/basic/xattr-util.c | 1 + - 2 files changed, 7 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/src/basic/missing.h b/src/basic/missing.h -index 34af717a7ce8..d17d725116e5 100644 +index 5f7d9c65d816..187b16757887 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h -@@ -917,6 +917,12 @@ static inline int setns(int fd, int nstype) { - #ifndef CLOCK_BOOTTIME_ALARM +@@ -842,6 +842,13 @@ struct btrfs_ioctl_quota_ctl_args { #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 + #endif diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c -index 8d7f14f3827e..dd9d2ebb1155 100644 +index 8256899edae3..dc64a9aeb4c8 100644 --- a/src/basic/xattr-util.c +++ b/src/basic/xattr-util.c @@ -25,6 +25,7 @@ diff --git a/patches/systemd-229/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch b/patches/systemd-230/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch index c52ea7826..2cbf4cf8a 100644 --- a/patches/systemd-229/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch +++ b/patches/systemd-230/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 5fd73c59f15a..507ad1cc0660 100644 +index 329861a291d2..35f96228f06a 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,7 @@ SET_ARCH(IA32, i*86*) diff --git a/patches/systemd-229/0006-missing-define-syncfs.patch b/patches/systemd-230/0006-missing-define-syncfs.patch index 536fd0c8a..b117a1e2e 100644 --- a/patches/systemd-229/0006-missing-define-syncfs.patch +++ b/patches/systemd-230/0006-missing-define-syncfs.patch @@ -8,31 +8,30 @@ Upstream requires glibc 2.16 but this is useful for host-systemd. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - configure.ac | 2 ++ - src/basic/missing.h | 7 +++++++ + configure.ac | 1 + + src/basic/missing.h | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index 507ad1cc0660..c998f6848d47 100644 +index 35f96228f06a..00a68a7ea867 100644 --- a/configure.ac +++ b/configure.ac -@@ -302,6 +302,8 @@ CAP_LIBS="$LIBS" - LIBS="$save_LIBS" - AC_SUBST(CAP_LIBS) - -+AC_CHECK_DECLS([syncfs], [], [], [[#include <unistd.h>]]) -+ - 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, +@@ -309,6 +309,7 @@ AC_CHECK_DECLS([ + pivot_root, + name_to_handle_at, + setns, ++ syncfs, + getrandom, + renameat2, + kcmp, diff --git a/src/basic/missing.h b/src/basic/missing.h -index d17d725116e5..c64131da01c7 100644 +index 187b16757887..e67763c9b8ca 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h -@@ -923,6 +923,13 @@ static inline int setns(int fd, int nstype) { - #ifndef AT_EMPTY_PATH +@@ -849,6 +849,14 @@ struct btrfs_ioctl_quota_ctl_args { #define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname */ #endif + +#if !HAVE_DECL_SYNCFS +static inline int syncfs(int fd) +{ @@ -40,6 +39,7 @@ index d17d725116e5..c64131da01c7 100644 + return -1; +} +#endif - ++ #ifndef IPV6_UNICAST_IF #define IPV6_UNICAST_IF 76 + #endif diff --git a/patches/systemd-229/0007-missing-add-more-btrfs-defines.patch b/patches/systemd-230/0007-missing-add-more-btrfs-defines.patch index 0d85b804a..c4a1e875b 100644 --- a/patches/systemd-229/0007-missing-add-more-btrfs-defines.patch +++ b/patches/systemd-230/0007-missing-add-more-btrfs-defines.patch @@ -4,14 +4,14 @@ 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(+) + src/basic/missing.h | 37 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) diff --git a/src/basic/missing.h b/src/basic/missing.h -index c64131da01c7..31fe1c5d44a7 100644 +index e67763c9b8ca..bb97544f750e 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h -@@ -387,6 +387,23 @@ struct btrfs_ioctl_quota_ctl_args { +@@ -310,6 +310,23 @@ struct btrfs_ioctl_quota_ctl_args { __u64 cmd; __u64 status; }; @@ -35,7 +35,7 @@ index c64131da01c7..31fe1c5d44a7 100644 #endif #ifndef BTRFS_IOC_DEFRAG -@@ -461,11 +478,35 @@ struct btrfs_ioctl_quota_ctl_args { +@@ -384,11 +401,31 @@ struct btrfs_ioctl_quota_ctl_args { struct btrfs_ioctl_quota_ctl_args) #endif @@ -64,10 +64,6 @@ index c64131da01c7..31fe1c5d44a7 100644 + 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 + #ifndef BTRFS_IOC_QUOTA_RESCAN_WAIT + #define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46) #endif diff --git a/patches/systemd-229/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch b/patches/systemd-230/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch index f75dd8613..f75dd8613 100644 --- a/patches/systemd-229/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch +++ b/patches/systemd-230/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch diff --git a/patches/systemd-229/0009-HACK-add-local-copy-of-uchar.h.patch b/patches/systemd-230/0009-HACK-add-local-copy-of-uchar.h.patch index 77dd2419b..07cc8c161 100644 --- a/patches/systemd-229/0009-HACK-add-local-copy-of-uchar.h.patch +++ b/patches/systemd-230/0009-HACK-add-local-copy-of-uchar.h.patch @@ -15,7 +15,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> create mode 100644 src/basic/_uchar.h diff --git a/configure.ac b/configure.ac -index c998f6848d47..e78ed97a8b7c 100644 +index 00a68a7ea867..650a5be1edf2 100644 --- a/configure.ac +++ b/configure.ac @@ -291,6 +291,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"]) @@ -111,7 +111,7 @@ index 000000000000..b15d355ae0c5 + +#endif /* uchar.h */ diff --git a/src/basic/escape.h b/src/basic/escape.h -index 1b28bd10afc2..007e9df8015d 100644 +index deaa4def2828..36d437cfaa2f 100644 --- a/src/basic/escape.h +++ b/src/basic/escape.h @@ -23,7 +23,6 @@ @@ -123,10 +123,10 @@ index 1b28bd10afc2..007e9df8015d 100644 #include "string-util.h" #include "missing.h" diff --git a/src/basic/missing.h b/src/basic/missing.h -index 31fe1c5d44a7..ff370fea99d1 100644 +index bb97544f750e..0d28c1a4c22a 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h -@@ -34,7 +34,11 @@ +@@ -35,7 +35,11 @@ #include <stdlib.h> #include <sys/resource.h> #include <sys/syscall.h> @@ -139,7 +139,7 @@ index 31fe1c5d44a7..ff370fea99d1 100644 #ifdef HAVE_AUDIT diff --git a/src/basic/utf8.h b/src/basic/utf8.h -index 12c272d66e35..bea93a64437e 100644 +index f9b9c9468bb1..6ac9a3c8d087 100644 --- a/src/basic/utf8.h +++ b/src/basic/utf8.h @@ -22,7 +22,6 @@ diff --git a/patches/systemd-229/0010-HACK-fix-building-without-linux-sctp.h.patch b/patches/systemd-230/0010-HACK-fix-building-without-linux-sctp.h.patch index 2b61ba4e8..640acba5a 100644 --- a/patches/systemd-229/0010-HACK-fix-building-without-linux-sctp.h.patch +++ b/patches/systemd-230/0010-HACK-fix-building-without-linux-sctp.h.patch @@ -13,7 +13,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 2 files changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index e78ed97a8b7c..733109747b07 100644 +index 650a5be1edf2..f7eb2c4f963f 100644 --- a/configure.ac +++ b/configure.ac @@ -292,6 +292,7 @@ AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers n @@ -25,7 +25,7 @@ index e78ed97a8b7c..733109747b07 100644 # 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 +index f6204d04bfd8..212ff2dd913d 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -26,7 +26,11 @@ @@ -38,5 +38,5 @@ index 976687af416d..9ebbb6378cb0 100644 +#define SCTP_NODELAY 3 +#endif - #include "sd-event.h" #include "alloc-util.h" + #include "bus-error.h" diff --git a/patches/systemd-230/0011-missing-add-SMACK_MAGIC-EFIVARFS_MAGIC-BINFMTFS_MAGI.patch b/patches/systemd-230/0011-missing-add-SMACK_MAGIC-EFIVARFS_MAGIC-BINFMTFS_MAGI.patch new file mode 100644 index 000000000..4372ab742 --- /dev/null +++ b/patches/systemd-230/0011-missing-add-SMACK_MAGIC-EFIVARFS_MAGIC-BINFMTFS_MAGI.patch @@ -0,0 +1,34 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Fri, 27 May 2016 10:49:55 +0200 +Subject: [PATCH] missing: add SMACK_MAGIC, EFIVARFS_MAGIC, BINFMTFS_MAGIC + +These were all introduced before kernel v3.9 + +Not for upstream, but needed for host-systemd. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + src/basic/missing.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/basic/missing.h b/src/basic/missing.h +index 0d28c1a4c22a..795a21bdf22d 100644 +--- a/src/basic/missing.h ++++ b/src/basic/missing.h +@@ -898,6 +898,16 @@ static inline int syncfs(int fd) + } + #endif + ++#ifndef SMACK_MAGIC ++#define SMACK_MAGIC 0x43415d53 ++#endif ++#ifndef EFIVARFS_MAGIC ++#define EFIVARFS_MAGIC 0xde5e81e4 ++#endif ++#ifndef BINFMTFS_MAGIC ++#define BINFMTFS_MAGIC 0x42494e4d ++#endif ++ + #ifndef IPV6_UNICAST_IF + #define IPV6_UNICAST_IF 76 + #endif diff --git a/patches/systemd-229/autogen.sh b/patches/systemd-230/autogen.sh index cbfab1ee7..cbfab1ee7 100755 --- a/patches/systemd-229/autogen.sh +++ b/patches/systemd-230/autogen.sh diff --git a/patches/systemd-229/series b/patches/systemd-230/series index dac126c74..9a20226b9 100644 --- a/patches/systemd-229/series +++ b/patches/systemd-230/series @@ -11,6 +11,6 @@ 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 +0011-missing-add-SMACK_MAGIC-EFIVARFS_MAGIC-BINFMTFS_MAGI.patch #tag:upstream --start-number 100 -0100-basic-user-utils.c-needs-missing.h-for-secure_getenv.patch -# dd2b53d96b8d4daf6822fc2a3324bc5b - git-ptx-patches magic +# 7f7dfeb35e2a532321c19ec07f30f1fb - git-ptx-patches magic diff --git a/rules/host-systemd.make b/rules/host-systemd.make index 547b3c853..835cc59b4 100644 --- a/rules/host-systemd.make +++ b/rules/host-systemd.make @@ -38,7 +38,6 @@ HOST_SYSTEMD_CONF_OPT := \ --disable-undefined-sanitizer \ --disable-dbus \ --disable-utmp \ - --disable-compat-libs \ --disable-coverage \ --disable-kmod \ --disable-xkbcommon \ @@ -47,6 +46,8 @@ HOST_SYSTEMD_CONF_OPT := \ --disable-ima \ --disable-selinux \ --disable-apparmor \ + --disable-adm-group \ + --disable-wheel-group \ --disable-xz \ --disable-zlib \ --disable-bzip2 \ @@ -65,7 +66,6 @@ HOST_SYSTEMD_CONF_OPT := \ --disable-libiptc \ --disable-binfmt \ --disable-vconsole \ - --disable-bootchart \ --disable-quotacheck \ --disable-tmpfiles \ --disable-sysusers \ @@ -86,6 +86,7 @@ HOST_SYSTEMD_CONF_OPT := \ --disable-networkd \ --disable-efi \ --disable-gnuefi \ + --disable-tpm \ --disable-kdbus \ --disable-myhostname \ --enable-hwdb \ diff --git a/rules/systemd.make b/rules/systemd.make index 71c633a8d..29ddbd84f 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd # # Paths and names # -SYSTEMD_VERSION := 229 -SYSTEMD_MD5 := 5d696f65381b2608da70544df07c2b3c +SYSTEMD_VERSION := 230 +SYSTEMD_MD5 := f2f10a6f100c38582b4f02d60210227d SYSTEMD := systemd-$(SYSTEMD_VERSION) SYSTEMD_SUFFIX := tar.gz SYSTEMD_URL := https://github.com/systemd/systemd/archive/v$(SYSTEMD_VERSION).$(SYSTEMD_SUFFIX) @@ -68,7 +68,6 @@ SYSTEMD_CONF_OPT := \ --disable-undefined-sanitizer \ --disable-dbus \ --disable-utmp \ - --enable-compat-libs \ --disable-coverage \ --enable-kmod \ --disable-xkbcommon \ @@ -77,6 +76,8 @@ SYSTEMD_CONF_OPT := \ --disable-ima \ $(GLOBAL_SELINUX_OPTION) \ --disable-apparmor \ + --enable-adm-group \ + --disable-wheel-group \ --$(call ptx/endis,PTXCONF_SYSTEMD_XZ)-xz \ --disable-zlib \ --disable-bzip2 \ @@ -95,7 +96,6 @@ SYSTEMD_CONF_OPT := \ --$(call ptx/endis,PTXCONF_SYSTEMD_IPMASQUERADE)-libiptc \ --disable-binfmt \ --$(call ptx/endis,PTXCONF_SYSTEMD_VCONSOLE)-vconsole \ - --enable-bootchart \ --enable-quotacheck \ --enable-tmpfiles \ --disable-sysusers \ @@ -116,6 +116,7 @@ SYSTEMD_CONF_OPT := \ --$(call ptx/endis,PTXCONF_SYSTEMD_NETWORK)-networkd \ --enable-efi \ --disable-gnuefi \ + --disable-tpm \ --enable-kdbus \ --enable-myhostname \ --$(call ptx/endis,PTXCONF_UDEV_HWDB)-hwdb \ @@ -174,9 +175,6 @@ endif SYSTEMD_HELPER := \ systemd \ systemd-ac-power \ - systemd-activate \ - systemd-bootchart \ - systemd-bus-proxyd \ systemd-cgroups-agent \ $(call ptx/ifdef, PTXCONF_SYSTEMD_COREDUMP,systemd-coredump,) \ systemd-fsck \ @@ -250,6 +248,7 @@ endif @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-delta) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-path) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-run) + @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-socket-activate) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-stdio-bridge) ifdef PTXCONF_SYSTEMD_TIMEDATE @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/timedatectl) @@ -272,8 +271,6 @@ endif @$(call install_alternative, systemd, 0, 0, 0644, \ /etc/systemd/system.conf) @$(call install_alternative, systemd, 0, 0, 0644, \ - /etc/systemd/bootchart.conf) - @$(call install_alternative, systemd, 0, 0, 0644, \ /etc/systemd/journald.conf) ifdef PTXCONF_SYSTEMD_LOGIND @$(call install_alternative, systemd, 0, 0, 0644, \ |