diff options
23 files changed, 15 insertions, 1568 deletions
diff --git a/patches/systemd-234/0001-missing-defined-extra-clock-ids.patch b/patches/systemd-234/0001-missing-defined-extra-clock-ids.patch deleted file mode 100644 index 0370dd0a8..000000000 --- a/patches/systemd-234/0001-missing-defined-extra-clock-ids.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Thu, 19 Jun 2014 10:48:55 +0200 -Subject: [PATCH] missing: defined extra clock ids - -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/basic/missing.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/basic/missing.h b/src/basic/missing.h -index 7830a4f415b9..ae5f3ce165eb 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -948,6 +948,16 @@ struct input_mask { - #define RTA_PREF 20 - #endif - -+#ifndef CLOCK_BOOTTIME -+#define CLOCK_BOOTTIME 7 -+#endif -+#ifndef CLOCK_REALTIME_ALARM -+#define CLOCK_REALTIME_ALARM 8 -+#endif -+#ifndef CLOCK_BOOTTIME_ALARM -+#define CLOCK_BOOTTIME_ALARM 9 -+#endif -+ - #ifndef IPV6_UNICAST_IF - #define IPV6_UNICAST_IF 76 - #endif diff --git a/patches/systemd-234/0002-missing-add-BPF_XOR.patch b/patches/systemd-234/0002-missing-add-BPF_XOR.patch deleted file mode 100644 index ed618b053..000000000 --- a/patches/systemd-234/0002-missing-add-BPF_XOR.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Thu, 21 Aug 2014 12:30:15 +0200 -Subject: [PATCH] missing: add BPF_XOR - -BPF_XOR was introduced in kernel 3.7 - -Not for upstream, but needed for host-systemd. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - src/basic/missing.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/basic/missing.h b/src/basic/missing.h -index ae5f3ce165eb..16c1a140ee65 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -1014,6 +1014,10 @@ struct input_mask { - # define BPF_XOR 0xa0 - #endif - -+#ifndef BPF_XOR -+# define BPF_XOR 0xa0 -+#endif -+ - /* Note that LOOPBACK_IFINDEX is currently not exported by the - * kernel/glibc, but hardcoded internally by the kernel. However, as - * it is exported to userspace indirectly via rtnetlink and the diff --git a/patches/systemd-234/0003-missing-define-__NR_kcmp-if-necessary.patch b/patches/systemd-234/0003-missing-define-__NR_kcmp-if-necessary.patch deleted file mode 100644 index de7dd1f1e..000000000 --- a/patches/systemd-234/0003-missing-define-__NR_kcmp-if-necessary.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Thu, 5 Mar 2015 10:33:25 +0100 -Subject: [PATCH] missing: define __NR_kcmp if necessary - -Needed for Kernel Headers < v3.5 - -Not for upstream, but needed for host-systemd. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - src/basic/missing_syscall.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 898116c7b310..cf9a57f92595 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -239,6 +239,10 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha - - /* ======================================================================= */ - -+#ifndef __NR_kcmp -+# define __NR_kcmp 0xffffffff -+#endif -+ - #if !HAVE_DECL_KCMP - static inline int kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { - # ifdef __NR_kcmp diff --git a/patches/systemd-234/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch b/patches/systemd-234/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch deleted file mode 100644 index 5085c8790..000000000 --- a/patches/systemd-234/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch +++ /dev/null @@ -1,44 +0,0 @@ -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/basic/missing.h | 7 +++++++ - src/basic/xattr-util.c | 1 + - 2 files changed, 8 insertions(+) - -diff --git a/src/basic/missing.h b/src/basic/missing.h -index 16c1a140ee65..8671c56140a6 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -958,6 +958,13 @@ struct input_mask { - #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 8256899edae3..dc64a9aeb4c8 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-234/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch b/patches/systemd-234/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch deleted file mode 100644 index fe1fd978f..000000000 --- a/patches/systemd-234/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Tue, 7 Jul 2015 09:58:21 +0200 -Subject: [PATCH] HACK: configure.ac: disable NLS to avoid unnecessary - dependencies during autogen.sh - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - configure.ac | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure.ac b/configure.ac -index c7537aafc0c9..c8fa808bc4d3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -60,6 +60,7 @@ SET_ARCH(MIPS, mips*) - SET_ARCH(ARM, arm*) - SET_ARCH(AARCH64, aarch64*) - -+m4_ifdef([AM_NLS__DISABLED], [ - # i18n stuff for the PolicyKit policy files, heck whether intltool can be found, disable NLS otherwise - AC_CHECK_PROG(intltool_found, [intltool-merge], [yes], [no]) - AS_IF([test x"$intltool_found" != xyes], -@@ -82,6 +83,12 @@ AS_IF([test -z "$INTLTOOL_POLICY_RULE"], [ - INTLTOOL_POLICY_RULE='%.policy: %.policy.in ; @echo " ITMRG " $@ && echo "*** intltool support required to build target $@" && false' - AC_SUBST(INTLTOOL_POLICY_RULE) - ]) -+],[ -+touch `dirname $0`/po/Makefile.in.in -+echo -e 'all:\ninstall:\n' > `dirname $0`/po/Makefile -+INTLTOOL_POLICY_RULE= -+AC_SUBST(INTLTOOL_POLICY_RULE) -+]) - - GETTEXT_PACKAGE=systemd - AC_SUBST(GETTEXT_PACKAGE) diff --git a/patches/systemd-234/0006-missing-define-syncfs.patch b/patches/systemd-234/0006-missing-define-syncfs.patch deleted file mode 100644 index 6dc619eca..000000000 --- a/patches/systemd-234/0006-missing-define-syncfs.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sat, 1 Aug 2015 21:36:38 +0200 -Subject: [PATCH] missing: define syncfs - -This is required for glibc < 2.14 - -Upstream requires glibc 2.16 but this is useful for host-systemd. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - configure.ac | 1 + - src/basic/missing.h | 8 ++++++++ - 2 files changed, 9 insertions(+) - -diff --git a/configure.ac b/configure.ac -index c8fa808bc4d3..2101755d4e58 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -335,6 +335,7 @@ AC_CHECK_DECLS([ - pivot_root, - name_to_handle_at, - setns, -+ syncfs, - renameat2, - kcmp, - keyctl, -diff --git a/src/basic/missing.h b/src/basic/missing.h -index 8671c56140a6..fae5329663b2 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -965,6 +965,14 @@ struct input_mask { - #define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname */ - #endif - -+#if !HAVE_DECL_SYNCFS -+static inline int syncfs(int fd) -+{ -+ errno = ENOSYS; -+ return -1; -+} -+#endif -+ - #ifndef IPV6_UNICAST_IF - #define IPV6_UNICAST_IF 76 - #endif diff --git a/patches/systemd-234/0007-missing-add-more-btrfs-defines.patch b/patches/systemd-234/0007-missing-add-more-btrfs-defines.patch deleted file mode 100644 index 35493d484..000000000 --- a/patches/systemd-234/0007-missing-add-more-btrfs-defines.patch +++ /dev/null @@ -1,69 +0,0 @@ -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 | 37 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 37 insertions(+) - -diff --git a/src/basic/missing.h b/src/basic/missing.h -index fae5329663b2..975d6054c5ce 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -331,6 +331,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 -@@ -405,11 +422,31 @@ 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 diff --git a/patches/systemd-234/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch b/patches/systemd-234/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch deleted file mode 100644 index f75dd8613..000000000 --- a/patches/systemd-234/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch +++ /dev/null @@ -1,24 +0,0 @@ -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-234/0009-HACK-add-local-copy-of-uchar.h.patch b/patches/systemd-234/0009-HACK-add-local-copy-of-uchar.h.patch deleted file mode 100644 index db5a28a9c..000000000 --- a/patches/systemd-234/0009-HACK-add-local-copy-of-uchar.h.patch +++ /dev/null @@ -1,152 +0,0 @@ -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 2101755d4e58..335a718ad2c1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -317,6 +317,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([linux/vm_sockets.h], [], [], [#include <sys/socket.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 6f5cc60bc80d..d2edac9ccdce 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 975d6054c5ce..a7f53e4622af 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -37,7 +37,11 @@ - #include <sys/resource.h> - #include <sys/socket.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 f9b9c9468bb1..6ac9a3c8d087 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-234/0010-HACK-fix-building-without-linux-sctp.h.patch b/patches/systemd-234/0010-HACK-fix-building-without-linux-sctp.h.patch deleted file mode 100644 index 77195d9a0..000000000 --- a/patches/systemd-234/0010-HACK-fix-building-without-linux-sctp.h.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 | 4 ++++ - src/core/socket.c | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 335a718ad2c1..b13ab6f0b67d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -318,6 +318,10 @@ AC_CHECK_HEADERS([linux/btrfs.h], [], []) - AC_CHECK_HEADERS([linux/memfd.h], [], []) - AC_CHECK_HEADERS([linux/vm_sockets.h], [], [], [#include <sys/socket.h>]) - AC_CHECK_HEADERS([uchar.h], [], []) -+AC_CHECK_HEADERS([linux/sctp.h], [], [], [ -+#include <stdint.h> -+#include <sys/socket.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 8750643d926c..e9f0d0f7c17e 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 "alloc-util.h" - #include "bus-error.h" diff --git a/patches/systemd-234/0011-missing-add-SMACK_MAGIC-EFIVARFS_MAGIC-BINFMTFS_MAGI.patch b/patches/systemd-234/0011-missing-add-SMACK_MAGIC-EFIVARFS_MAGIC-BINFMTFS_MAGI.patch deleted file mode 100644 index 6fe162a89..000000000 --- a/patches/systemd-234/0011-missing-add-SMACK_MAGIC-EFIVARFS_MAGIC-BINFMTFS_MAGI.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 a7f53e4622af..54ee7fa91414 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -1014,6 +1014,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-234/0012-missing-define-PR_SET_MM.patch b/patches/systemd-234/0012-missing-define-PR_SET_MM.patch deleted file mode 100644 index 4c0f4417c..000000000 --- a/patches/systemd-234/0012-missing-define-PR_SET_MM.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Mon, 13 Mar 2017 18:43:37 +0100 -Subject: [PATCH] missing: define PR_SET_MM* - -These were all introduced before kernel v3.4 - -Not for upstream, but needed for host-systemd. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - src/basic/missing.h | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/src/basic/missing.h b/src/basic/missing.h -index 54ee7fa91414..3bebd8d59e47 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -1024,6 +1024,25 @@ static inline int syncfs(int fd) - #define BINFMTFS_MAGIC 0x42494e4d - #endif - -+#ifndef PR_SET_MM -+#define PR_SET_MM 35 -+# define PR_SET_MM_START_CODE 1 -+# define PR_SET_MM_END_CODE 2 -+# define PR_SET_MM_START_DATA 3 -+# define PR_SET_MM_END_DATA 4 -+# define PR_SET_MM_START_STACK 5 -+# define PR_SET_MM_START_BRK 6 -+# define PR_SET_MM_BRK 7 -+# define PR_SET_MM_ARG_START 8 -+# define PR_SET_MM_ARG_END 9 -+# define PR_SET_MM_ENV_START 10 -+# define PR_SET_MM_ENV_END 11 -+# define PR_SET_MM_AUXV 12 -+# define PR_SET_MM_EXE_FILE 13 -+# define PR_SET_MM_MAP 14 -+# define PR_SET_MM_MAP_SIZE 15 -+#endif -+ - #ifndef IPV6_UNICAST_IF - #define IPV6_UNICAST_IF 76 - #endif diff --git a/patches/systemd-234/0100-build-don-t-install-broken-var-lib-machines.mount-li.patch b/patches/systemd-234/0100-build-don-t-install-broken-var-lib-machines.mount-li.patch deleted file mode 100644 index d263d6495..000000000 --- a/patches/systemd-234/0100-build-don-t-install-broken-var-lib-machines.mount-li.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Wed, 13 Sep 2017 12:24:17 +0200 -Subject: [PATCH] build: don't install broken var-lib-machines.mount link if - machined is disabled - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index c16e62280be7..ff10cfe4cd97 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -6602,8 +6602,10 @@ LOCAL_FS_TARGET_WANTS += \ - systemd-remount-fs.service \ - tmp.mount - -+if ENABLE_MACHINED - REMOTE_FS_TARGET_WANTS += \ - var-lib-machines.mount -+endif - - MULTI_USER_TARGET_WANTS += \ - getty.target \ diff --git a/patches/systemd-234/autogen.sh b/patches/systemd-234/autogen.sh deleted file mode 100755 index cbfab1ee7..000000000 --- a/patches/systemd-234/autogen.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -autoreconf \ - --force \ - --install \ - --warnings=cross \ - --warnings=syntax \ - --warnings=obsolete \ - --warnings=unsupported diff --git a/patches/systemd-234/series b/patches/systemd-234/series deleted file mode 100644 index c39337ae1..000000000 --- a/patches/systemd-234/series +++ /dev/null @@ -1,18 +0,0 @@ -# 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 -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-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 -0012-missing-define-PR_SET_MM.patch -#tag:fixes --start-number 100 -0100-build-don-t-install-broken-var-lib-machines.mount-li.patch -# 8331ad1f7461614c95d5eac0a9d31dc5 - git-ptx-patches magic diff --git a/patches/systemd-235/0001-i18n-drop-intltool-use-use-meson-s-merge_file-direct.patch b/patches/systemd-235/0001-i18n-drop-intltool-use-use-meson-s-merge_file-direct.patch deleted file mode 100644 index e9a0d05ac..000000000 --- a/patches/systemd-235/0001-i18n-drop-intltool-use-use-meson-s-merge_file-direct.patch +++ /dev/null @@ -1,866 +0,0 @@ -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Mon, 13 Nov 2017 13:30:39 +0100 -Subject: [PATCH] i18n: drop intltool use, use meson's merge_file directly - -This didn't work during the initial conversion to meson, but should now. -A sufficiently new polkit is also required, for the .its rules files. - -Note that https://github.com/mesonbuild/meson/blob/master/docs/markdown/i18n-module.md -says that 'install' argument was added in meson 0.43.0. If this is accurate, -warnigs might be generated with older mesons. Fedora has 0.43.0 across the -board, but other distros probably don't, but I guess that a warning is -prefereable to having to update do latest meson. - -The advantages are: -- one less dependency (intltool) -- using the generic implementation instead of our open-coded calls -- we don't need to use the fake "_" prefixes in XML - -Replaces #1609, fixes #7300. ---- - README | 1 + - po/meson.build | 8 -- - src/core/meson.build | 15 +-- - src/core/org.freedesktop.systemd1.policy.in.in | 20 ++-- - src/hostname/meson.build | 4 +- - src/hostname/org.freedesktop.hostname1.policy.in | 12 +-- - src/import/meson.build | 4 +- - src/import/org.freedesktop.import1.policy.in | 12 +-- - src/locale/meson.build | 4 +- - src/locale/org.freedesktop.locale1.policy.in | 8 +- - src/login/meson.build | 4 +- - src/login/org.freedesktop.login1.policy.in | 128 +++++++++++------------ - src/machine/meson.build | 4 +- - src/machine/org.freedesktop.machine1.policy.in | 32 +++--- - src/timedate/meson.build | 4 +- - src/timedate/org.freedesktop.timedate1.policy.in | 20 ++-- - 16 files changed, 131 insertions(+), 149 deletions(-) - -diff --git a/README b/README -index e36a1f9fa156..f73524df1d72 100644 ---- a/README -+++ b/README -@@ -149,6 +149,7 @@ REQUIREMENTS: - libpython (optional) - libidn2 or libidn (optional) - elfutils >= 158 (optional) -+ polkit >= 0.113-22-gc78819245f (optional) - pkg-config - gperf - docbook-xsl (optional, required for documentation) -diff --git a/po/meson.build b/po/meson.build -index f89291bfc435..c4654be5ffe5 100644 ---- a/po/meson.build -+++ b/po/meson.build -@@ -1,12 +1,4 @@ - i18n = import('i18n') - i18n.gettext(meson.project_name()) - --##################################################################### -- --intltool_merge = find_program('intltool-merge') - po_dir = meson.current_source_dir() -- --intltool_cache = join_paths(meson.current_build_dir(), 'intltool-merge-cache') --intltool_command = [intltool_merge, '-x', '-u', -- '-c', intltool_cache, -- po_dir, '@INPUT@', '@OUTPUT@'] -diff --git a/src/core/meson.build b/src/core/meson.build -index 4355f9ca6dbb..d364c5a284a2 100644 ---- a/src/core/meson.build -+++ b/src/core/meson.build -@@ -197,25 +197,14 @@ policy_in = configure_file( - output : 'org.freedesktop.systemd1.policy.in', - configuration : substs) - --custom_target( -+i18n.merge_file( - 'org.freedesktop.systemd1.policy', - input : policy_in, - output : 'org.freedesktop.systemd1.policy', -- command : intltool_command, -+ po_dir : po_dir, - install : install_polkit, - install_dir : polkitpolicydir) - --# TODO: this might work with meson from git, see --# https://github.com/mesonbuild/meson/issues/1441#issuecomment-283585493 --# --# i18n.merge_file( --# 'org.freedesktop.systemd1.policy', --# po_dir : po_dir, --# input : policy_in, --# output : 'org.freedesktop.systemd1.policy', --# install : install_polkit, --# install_dir : polkitpolicydir) -- - install_data('system.conf', - 'user.conf', - install_dir : pkgsysconfdir) -diff --git a/src/core/org.freedesktop.systemd1.policy.in.in b/src/core/org.freedesktop.systemd1.policy.in.in -index cc39a9e1c3ac..9f9263762e83 100644 ---- a/src/core/org.freedesktop.systemd1.policy.in.in -+++ b/src/core/org.freedesktop.systemd1.policy.in.in -@@ -17,8 +17,8 @@ - <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url> - - <action id="org.freedesktop.systemd1.reply-password"> -- <_description>Send passphrase back to system</_description> -- <_message>Authentication is required to send the entered passphrase back to the system.</_message> -+ <description>Send passphrase back to system</description> -+ <message>Authentication is required to send the entered passphrase back to the system.</message> - <defaults> - <allow_any>no</allow_any> - <allow_inactive>no</allow_inactive> -@@ -28,8 +28,8 @@ - </action> - - <action id="org.freedesktop.systemd1.manage-units"> -- <_description>Manage system services or other units</_description> -- <_message>Authentication is required to manage system services or other units.</_message> -+ <description>Manage system services or other units</description> -+ <message>Authentication is required to manage system services or other units.</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -@@ -38,8 +38,8 @@ - </action> - - <action id="org.freedesktop.systemd1.manage-unit-files"> -- <_description>Manage system service or unit files</_description> -- <_message>Authentication is required to manage system service or unit files.</_message> -+ <description>Manage system service or unit files</description> -+ <message>Authentication is required to manage system service or unit files.</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -@@ -48,8 +48,8 @@ - </action> - - <action id="org.freedesktop.systemd1.set-environment"> -- <_description>Set or unset system and service manager environment variables</_description> -- <_message>Authentication is required to set or unset system and service manager environment variables.</_message> -+ <description>Set or unset system and service manager environment variables</description> -+ <message>Authentication is required to set or unset system and service manager environment variables.</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -@@ -58,8 +58,8 @@ - </action> - - <action id="org.freedesktop.systemd1.reload-daemon"> -- <_description>Reload the systemd state</_description> -- <_message>Authentication is required to reload the systemd state.</_message> -+ <description>Reload the systemd state</description> -+ <message>Authentication is required to reload the systemd state.</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -diff --git a/src/hostname/meson.build b/src/hostname/meson.build -index 834300ae6e1f..b4db5afb1f6e 100644 ---- a/src/hostname/meson.build -+++ b/src/hostname/meson.build -@@ -4,11 +4,11 @@ if conf.get('ENABLE_HOSTNAMED') == 1 - install_data('org.freedesktop.hostname1.service', - install_dir : dbussystemservicedir) - -- custom_target( -+ i18n.merge_file( - 'org.freedesktop.hostname1.policy', - input : 'org.freedesktop.hostname1.policy.in', - output : 'org.freedesktop.hostname1.policy', -- command : intltool_command, -+ po_dir : po_dir, - install : install_polkit, - install_dir : polkitpolicydir) - endif -diff --git a/src/hostname/org.freedesktop.hostname1.policy.in b/src/hostname/org.freedesktop.hostname1.policy.in -index c32c1d4fda05..cf61c15619cc 100644 ---- a/src/hostname/org.freedesktop.hostname1.policy.in -+++ b/src/hostname/org.freedesktop.hostname1.policy.in -@@ -17,8 +17,8 @@ - <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url> - - <action id="org.freedesktop.hostname1.set-hostname"> -- <_description>Set host name</_description> -- <_message>Authentication is required to set the local host name.</_message> -+ <description>Set host name</description> -+ <message>Authentication is required to set the local host name.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -27,8 +27,8 @@ - </action> - - <action id="org.freedesktop.hostname1.set-static-hostname"> -- <_description>Set static host name</_description> -- <_message>Authentication is required to set the statically configured local host name, as well as the pretty host name.</_message> -+ <description>Set static host name</description> -+ <message>Authentication is required to set the statically configured local host name, as well as the pretty host name.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -38,8 +38,8 @@ - </action> - - <action id="org.freedesktop.hostname1.set-machine-info"> -- <_description>Set machine information</_description> -- <_message>Authentication is required to set local machine information.</_message> -+ <description>Set machine information</description> -+ <message>Authentication is required to set local machine information.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -diff --git a/src/import/meson.build b/src/import/meson.build -index e3a0da65d211..9ace20f50d94 100644 ---- a/src/import/meson.build -+++ b/src/import/meson.build -@@ -54,11 +54,11 @@ if conf.get('ENABLE_IMPORTD') == 1 - install_data('org.freedesktop.import1.service', - install_dir : dbussystemservicedir) - -- custom_target( -+ i18n.merge_file( - 'org.freedesktop.import1.policy', - input : 'org.freedesktop.import1.policy.in', - output : 'org.freedesktop.import1.policy', -- command : intltool_command, -+ po_dir : po_dir, - install : install_polkit, - install_dir : polkitpolicydir) - -diff --git a/src/import/org.freedesktop.import1.policy.in b/src/import/org.freedesktop.import1.policy.in -index 85924ed7437b..39167b06bc24 100644 ---- a/src/import/org.freedesktop.import1.policy.in -+++ b/src/import/org.freedesktop.import1.policy.in -@@ -17,8 +17,8 @@ - <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url> - - <action id="org.freedesktop.import1.import"> -- <_description>Import a VM or container image</_description> -- <_message>Authentication is required to import a VM or container image</_message> -+ <description>Import a VM or container image</description> -+ <message>Authentication is required to import a VM or container image</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -@@ -27,8 +27,8 @@ - </action> - - <action id="org.freedesktop.import1.export"> -- <_description>Export a VM or container image</_description> -- <_message>Authentication is required to export a VM or container image</_message> -+ <description>Export a VM or container image</description> -+ <message>Authentication is required to export a VM or container image</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -@@ -37,8 +37,8 @@ - </action> - - <action id="org.freedesktop.import1.pull"> -- <_description>Download a VM or container image</_description> -- <_message>Authentication is required to download a VM or container image</_message> -+ <description>Download a VM or container image</description> -+ <message>Authentication is required to download a VM or container image</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -diff --git a/src/locale/meson.build b/src/locale/meson.build -index e9de6089f319..a0411fb1a666 100644 ---- a/src/locale/meson.build -+++ b/src/locale/meson.build -@@ -12,11 +12,11 @@ if conf.get('ENABLE_LOCALED') == 1 - install_data('org.freedesktop.locale1.service', - install_dir : dbussystemservicedir) - -- custom_target( -+ i18n.merge_file( - 'org.freedesktop.locale1.policy', - input : 'org.freedesktop.locale1.policy.in', - output : 'org.freedesktop.locale1.policy', -- command : intltool_command, -+ po_dir : po_dir, - install : install_polkit, - install_dir : polkitpolicydir) - endif -diff --git a/src/locale/org.freedesktop.locale1.policy.in b/src/locale/org.freedesktop.locale1.policy.in -index df63845e9be6..575a1ffaaf04 100644 ---- a/src/locale/org.freedesktop.locale1.policy.in -+++ b/src/locale/org.freedesktop.locale1.policy.in -@@ -17,8 +17,8 @@ - <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url> - - <action id="org.freedesktop.locale1.set-locale"> -- <_description>Set system locale</_description> -- <_message>Authentication is required to set the system locale.</_message> -+ <description>Set system locale</description> -+ <message>Authentication is required to set the system locale.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -28,8 +28,8 @@ - </action> - - <action id="org.freedesktop.locale1.set-keyboard"> -- <_description>Set system keyboard settings</_description> -- <_message>Authentication is required to set the system keyboard settings.</_message> -+ <description>Set system keyboard settings</description> -+ <message>Authentication is required to set the system keyboard settings.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -diff --git a/src/login/meson.build b/src/login/meson.build -index d0723f134f43..339c5d73cae3 100644 ---- a/src/login/meson.build -+++ b/src/login/meson.build -@@ -71,11 +71,11 @@ if conf.get('ENABLE_LOGIND') == 1 - install_data('org.freedesktop.login1.service', - install_dir : dbussystemservicedir) - -- custom_target( -+ i18n.merge_file( - 'org.freedesktop.login1.policy', - input : 'org.freedesktop.login1.policy.in', - output : 'org.freedesktop.login1.policy', -- command : intltool_command, -+ po_dir : po_dir, - install : install_polkit, - install_dir : polkitpolicydir) - -diff --git a/src/login/org.freedesktop.login1.policy.in b/src/login/org.freedesktop.login1.policy.in -index 3e8a9bbe3f9f..17bae02f5e6e 100644 ---- a/src/login/org.freedesktop.login1.policy.in -+++ b/src/login/org.freedesktop.login1.policy.in -@@ -17,8 +17,8 @@ - <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url> - - <action id="org.freedesktop.login1.inhibit-block-shutdown"> -- <_description>Allow applications to inhibit system shutdown</_description> -- <_message>Authentication is required for an application to inhibit system shutdown.</_message> -+ <description>Allow applications to inhibit system shutdown</description> -+ <message>Authentication is required for an application to inhibit system shutdown.</message> - <defaults> - <allow_any>no</allow_any> - <allow_inactive>yes</allow_inactive> -@@ -28,8 +28,8 @@ - </action> - - <action id="org.freedesktop.login1.inhibit-delay-shutdown"> -- <_description>Allow applications to delay system shutdown</_description> -- <_message>Authentication is required for an application to delay system shutdown.</_message> -+ <description>Allow applications to delay system shutdown</description> -+ <message>Authentication is required for an application to delay system shutdown.</message> - <defaults> - <allow_any>yes</allow_any> - <allow_inactive>yes</allow_inactive> -@@ -39,8 +39,8 @@ - </action> - - <action id="org.freedesktop.login1.inhibit-block-sleep"> -- <_description>Allow applications to inhibit system sleep</_description> -- <_message>Authentication is required for an application to inhibit system sleep.</_message> -+ <description>Allow applications to inhibit system sleep</description> -+ <message>Authentication is required for an application to inhibit system sleep.</message> - <defaults> - <allow_any>no</allow_any> - <allow_inactive>yes</allow_inactive> -@@ -50,8 +50,8 @@ - </action> - - <action id="org.freedesktop.login1.inhibit-delay-sleep"> -- <_description>Allow applications to delay system sleep</_description> -- <_message>Authentication is required for an application to delay system sleep.</_message> -+ <description>Allow applications to delay system sleep</description> -+ <message>Authentication is required for an application to delay system sleep.</message> - <defaults> - <allow_any>yes</allow_any> - <allow_inactive>yes</allow_inactive> -@@ -60,8 +60,8 @@ - </action> - - <action id="org.freedesktop.login1.inhibit-block-idle"> -- <_description>Allow applications to inhibit automatic system suspend</_description> -- <_message>Authentication is required for an application to inhibit automatic system suspend.</_message> -+ <description>Allow applications to inhibit automatic system suspend</description> -+ <message>Authentication is required for an application to inhibit automatic system suspend.</message> - <defaults> - <allow_any>yes</allow_any> - <allow_inactive>yes</allow_inactive> -@@ -70,8 +70,8 @@ - </action> - - <action id="org.freedesktop.login1.inhibit-handle-power-key"> -- <_description>Allow applications to inhibit system handling of the power key</_description> -- <_message>Authentication is required for an application to inhibit system handling of the power key.</_message> -+ <description>Allow applications to inhibit system handling of the power key</description> -+ <message>Authentication is required for an application to inhibit system handling of the power key.</message> - <defaults> - <allow_any>no</allow_any> - <allow_inactive>yes</allow_inactive> -@@ -81,8 +81,8 @@ - </action> - - <action id="org.freedesktop.login1.inhibit-handle-suspend-key"> -- <_description>Allow applications to inhibit system handling of the suspend key</_description> -- <_message>Authentication is required for an application to inhibit system handling of the suspend key.</_message> -+ <description>Allow applications to inhibit system handling of the suspend key</description> -+ <message>Authentication is required for an application to inhibit system handling of the suspend key.</message> - <defaults> - <allow_any>no</allow_any> - <allow_inactive>yes</allow_inactive> -@@ -92,8 +92,8 @@ - </action> - - <action id="org.freedesktop.login1.inhibit-handle-hibernate-key"> -- <_description>Allow applications to inhibit system handling of the hibernate key</_description> -- <_message>Authentication is required for an application to inhibit system handling of the hibernate key.</_message> -+ <description>Allow applications to inhibit system handling of the hibernate key</description> -+ <message>Authentication is required for an application to inhibit system handling of the hibernate key.</message> - <defaults> - <allow_any>no</allow_any> - <allow_inactive>yes</allow_inactive> -@@ -102,8 +102,8 @@ - </action> - - <action id="org.freedesktop.login1.inhibit-handle-lid-switch"> -- <_description>Allow applications to inhibit system handling of the lid switch</_description> -- <_message>Authentication is required for an application to inhibit system handling of the lid switch.</_message> -+ <description>Allow applications to inhibit system handling of the lid switch</description> -+ <message>Authentication is required for an application to inhibit system handling of the lid switch.</message> - <defaults> - <allow_any>no</allow_any> - <allow_inactive>yes</allow_inactive> -@@ -112,8 +112,8 @@ - </action> - - <action id="org.freedesktop.login1.set-self-linger"> -- <_description>Allow non-logged-in user to run programs</_description> -- <_message>Explicit request is required to run programs as a non-logged-in user.</_message> -+ <description>Allow non-logged-in user to run programs</description> -+ <message>Explicit request is required to run programs as a non-logged-in user.</message> - <defaults> - <allow_any>yes</allow_any> - <allow_inactive>yes</allow_inactive> -@@ -122,8 +122,8 @@ - </action> - - <action id="org.freedesktop.login1.set-user-linger"> -- <_description>Allow non-logged-in users to run programs</_description> -- <_message>Authentication is required to run programs as a non-logged-in user.</_message> -+ <description>Allow non-logged-in users to run programs</description> -+ <message>Authentication is required to run programs as a non-logged-in user.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -132,8 +132,8 @@ - </action> - - <action id="org.freedesktop.login1.attach-device"> -- <_description>Allow attaching devices to seats</_description> -- <_message>Authentication is required for attaching a device to a seat.</_message> -+ <description>Allow attaching devices to seats</description> -+ <message>Authentication is required for attaching a device to a seat.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -143,8 +143,8 @@ - </action> - - <action id="org.freedesktop.login1.flush-devices"> -- <_description>Flush device to seat attachments</_description> -- <_message>Authentication is required for resetting how devices are attached to seats.</_message> -+ <description>Flush device to seat attachments</description> -+ <message>Authentication is required for resetting how devices are attached to seats.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -153,8 +153,8 @@ - </action> - - <action id="org.freedesktop.login1.power-off"> -- <_description>Power off the system</_description> -- <_message>Authentication is required for powering off the system.</_message> -+ <description>Power off the system</description> -+ <message>Authentication is required for powering off the system.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -164,8 +164,8 @@ - </action> - - <action id="org.freedesktop.login1.power-off-multiple-sessions"> -- <_description>Power off the system while other users are logged in</_description> -- <_message>Authentication is required for powering off the system while other users are logged in.</_message> -+ <description>Power off the system while other users are logged in</description> -+ <message>Authentication is required for powering off the system while other users are logged in.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -175,8 +175,8 @@ - </action> - - <action id="org.freedesktop.login1.power-off-ignore-inhibit"> -- <_description>Power off the system while an application asked to inhibit it</_description> -- <_message>Authentication is required for powering off the system while an application asked to inhibit it.</_message> -+ <description>Power off the system while an application asked to inhibit it</description> -+ <message>Authentication is required for powering off the system while an application asked to inhibit it.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -186,8 +186,8 @@ - </action> - - <action id="org.freedesktop.login1.reboot"> -- <_description>Reboot the system</_description> -- <_message>Authentication is required for rebooting the system.</_message> -+ <description>Reboot the system</description> -+ <message>Authentication is required for rebooting the system.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -197,8 +197,8 @@ - </action> - - <action id="org.freedesktop.login1.reboot-multiple-sessions"> -- <_description>Reboot the system while other users are logged in</_description> -- <_message>Authentication is required for rebooting the system while other users are logged in.</_message> -+ <description>Reboot the system while other users are logged in</description> -+ <message>Authentication is required for rebooting the system while other users are logged in.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -208,8 +208,8 @@ - </action> - - <action id="org.freedesktop.login1.reboot-ignore-inhibit"> -- <_description>Reboot the system while an application asked to inhibit it</_description> -- <_message>Authentication is required for rebooting the system while an application asked to inhibit it.</_message> -+ <description>Reboot the system while an application asked to inhibit it</description> -+ <message>Authentication is required for rebooting the system while an application asked to inhibit it.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -219,8 +219,8 @@ - </action> - - <action id="org.freedesktop.login1.halt"> -- <_description>Halt the system</_description> -- <_message>Authentication is required for halting the system.</_message> -+ <description>Halt the system</description> -+ <message>Authentication is required for halting the system.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -230,8 +230,8 @@ - </action> - - <action id="org.freedesktop.login1.halt-multiple-sessions"> -- <_description>Halt the system while other users are logged in</_description> -- <_message>Authentication is required for halting the system while other users are logged in.</_message> -+ <description>Halt the system while other users are logged in</description> -+ <message>Authentication is required for halting the system while other users are logged in.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -241,8 +241,8 @@ - </action> - - <action id="org.freedesktop.login1.halt-ignore-inhibit"> -- <_description>Halt the system while an application asked to inhibit it</_description> -- <_message>Authentication is required for halting the system while an application asked to inhibit it.</_message> -+ <description>Halt the system while an application asked to inhibit it</description> -+ <message>Authentication is required for halting the system while an application asked to inhibit it.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -252,8 +252,8 @@ - </action> - - <action id="org.freedesktop.login1.suspend"> -- <_description>Suspend the system</_description> -- <_message>Authentication is required for suspending the system.</_message> -+ <description>Suspend the system</description> -+ <message>Authentication is required for suspending the system.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -262,8 +262,8 @@ - </action> - - <action id="org.freedesktop.login1.suspend-multiple-sessions"> -- <_description>Suspend the system while other users are logged in</_description> -- <_message>Authentication is required for suspending the system while other users are logged in.</_message> -+ <description>Suspend the system while other users are logged in</description> -+ <message>Authentication is required for suspending the system while other users are logged in.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -273,8 +273,8 @@ - </action> - - <action id="org.freedesktop.login1.suspend-ignore-inhibit"> -- <_description>Suspend the system while an application asked to inhibit it</_description> -- <_message>Authentication is required for suspending the system while an application asked to inhibit it.</_message> -+ <description>Suspend the system while an application asked to inhibit it</description> -+ <message>Authentication is required for suspending the system while an application asked to inhibit it.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -284,8 +284,8 @@ - </action> - - <action id="org.freedesktop.login1.hibernate"> -- <_description>Hibernate the system</_description> -- <_message>Authentication is required for hibernating the system.</_message> -+ <description>Hibernate the system</description> -+ <message>Authentication is required for hibernating the system.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -294,8 +294,8 @@ - </action> - - <action id="org.freedesktop.login1.hibernate-multiple-sessions"> -- <_description>Hibernate the system while other users are logged in</_description> -- <_message>Authentication is required for hibernating the system while other users are logged in.</_message> -+ <description>Hibernate the system while other users are logged in</description> -+ <message>Authentication is required for hibernating the system while other users are logged in.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -305,8 +305,8 @@ - </action> - - <action id="org.freedesktop.login1.hibernate-ignore-inhibit"> -- <_description>Hibernate the system while an application asked to inhibit it</_description> -- <_message>Authentication is required for hibernating the system while an application asked to inhibit it.</_message> -+ <description>Hibernate the system while an application asked to inhibit it</description> -+ <message>Authentication is required for hibernating the system while an application asked to inhibit it.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -316,8 +316,8 @@ - </action> - - <action id="org.freedesktop.login1.manage"> -- <_description>Manage active sessions, users and seats</_description> -- <_message>Authentication is required for managing active sessions, users and seats.</_message> -+ <description>Manage active sessions, users and seats</description> -+ <message>Authentication is required for managing active sessions, users and seats.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -326,8 +326,8 @@ - </action> - - <action id="org.freedesktop.login1.lock-sessions"> -- <_description>Lock or unlock active sessions</_description> -- <_message>Authentication is required to lock or unlock active sessions.</_message> -+ <description>Lock or unlock active sessions</description> -+ <message>Authentication is required to lock or unlock active sessions.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -336,8 +336,8 @@ - </action> - - <action id="org.freedesktop.login1.set-reboot-to-firmware-setup"> -- <_description>Allow indication to the firmware to boot to setup interface</_description> -- <_message>Authentication is required to indicate to the firmware to boot to setup interface.</_message> -+ <description>Allow indication to the firmware to boot to setup interface</description> -+ <message>Authentication is required to indicate to the firmware to boot to setup interface.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -346,8 +346,8 @@ - </action> - - <action id="org.freedesktop.login1.set-wall-message"> -- <_description>Set a wall message</_description> -- <_message>Authentication is required to set a wall message</_message> -+ <description>Set a wall message</description> -+ <message>Authentication is required to set a wall message</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -diff --git a/src/machine/meson.build b/src/machine/meson.build -index 693503da539f..bdf64ac3d2b7 100644 ---- a/src/machine/meson.build -+++ b/src/machine/meson.build -@@ -27,11 +27,11 @@ if conf.get('ENABLE_MACHINED') == 1 - install_data('org.freedesktop.machine1.service', - install_dir : dbussystemservicedir) - -- custom_target( -+ i18n.merge_file( - 'org.freedesktop.machine1.policy', - input : 'org.freedesktop.machine1.policy.in', - output : 'org.freedesktop.machine1.policy', -- command : intltool_command, -+ po_dir : po_dir, - install : install_polkit, - install_dir : polkitpolicydir) - endif -diff --git a/src/machine/org.freedesktop.machine1.policy.in b/src/machine/org.freedesktop.machine1.policy.in -index 69f78a5c2505..b266b564b050 100644 ---- a/src/machine/org.freedesktop.machine1.policy.in -+++ b/src/machine/org.freedesktop.machine1.policy.in -@@ -17,8 +17,8 @@ - <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url> - - <action id="org.freedesktop.machine1.login"> -- <_description>Log into a local container</_description> -- <_message>Authentication is required to log into a local container.</_message> -+ <description>Log into a local container</description> -+ <message>Authentication is required to log into a local container.</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -@@ -27,8 +27,8 @@ - </action> - - <action id="org.freedesktop.machine1.host-login"> -- <_description>Log into the local host</_description> -- <_message>Authentication is required to log into the local host.</_message> -+ <description>Log into the local host</description> -+ <message>Authentication is required to log into the local host.</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -@@ -37,8 +37,8 @@ - </action> - - <action id="org.freedesktop.machine1.shell"> -- <_description>Acquire a shell in a local container</_description> -- <_message>Authentication is required to acquire a shell in a local container.</_message> -+ <description>Acquire a shell in a local container</description> -+ <message>Authentication is required to acquire a shell in a local container.</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -@@ -48,8 +48,8 @@ - </action> - - <action id="org.freedesktop.machine1.host-shell"> -- <_description>Acquire a shell on the local host</_description> -- <_message>Authentication is required to acquire a shell on the local host.</_message> -+ <description>Acquire a shell on the local host</description> -+ <message>Authentication is required to acquire a shell on the local host.</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -@@ -59,8 +59,8 @@ - </action> - - <action id="org.freedesktop.machine1.open-pty"> -- <_description>Acquire a pseudo TTY in a local container</_description> -- <_message>Authentication is required to acquire a pseudo TTY in a local container.</_message> -+ <description>Acquire a pseudo TTY in a local container</description> -+ <message>Authentication is required to acquire a pseudo TTY in a local container.</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -@@ -69,8 +69,8 @@ - </action> - - <action id="org.freedesktop.machine1.host-open-pty"> -- <_description>Acquire a pseudo TTY on the local host</_description> -- <_message>Authentication is required to acquire a pseudo TTY on the local host.</_message> -+ <description>Acquire a pseudo TTY on the local host</description> -+ <message>Authentication is required to acquire a pseudo TTY on the local host.</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -@@ -79,8 +79,8 @@ - </action> - - <action id="org.freedesktop.machine1.manage-machines"> -- <_description>Manage local virtual machines and containers</_description> -- <_message>Authentication is required to manage local virtual machines and containers.</_message> -+ <description>Manage local virtual machines and containers</description> -+ <message>Authentication is required to manage local virtual machines and containers.</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -@@ -90,8 +90,8 @@ - </action> - - <action id="org.freedesktop.machine1.manage-images"> -- <_description>Manage local virtual machine and container images</_description> -- <_message>Authentication is required to manage local virtual machine and container images.</_message> -+ <description>Manage local virtual machine and container images</description> -+ <message>Authentication is required to manage local virtual machine and container images.</message> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> -diff --git a/src/timedate/meson.build b/src/timedate/meson.build -index ce92a6be692b..188cdcac7d4d 100644 ---- a/src/timedate/meson.build -+++ b/src/timedate/meson.build -@@ -4,11 +4,11 @@ if conf.get('ENABLE_TIMEDATED') == 1 - install_data('org.freedesktop.timedate1.service', - install_dir : dbussystemservicedir) - -- custom_target( -+ i18n.merge_file( - 'org.freedesktop.timedate1.policy', - input : 'org.freedesktop.timedate1.policy.in', - output : 'org.freedesktop.timedate1.policy', -- command : intltool_command, -+ po_dir : po_dir, - install : install_polkit, - install_dir : polkitpolicydir) - endif -diff --git a/src/timedate/org.freedesktop.timedate1.policy.in b/src/timedate/org.freedesktop.timedate1.policy.in -index aa30b70831ad..c70605098514 100644 ---- a/src/timedate/org.freedesktop.timedate1.policy.in -+++ b/src/timedate/org.freedesktop.timedate1.policy.in -@@ -17,8 +17,8 @@ - <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url> - - <action id="org.freedesktop.timedate1.set-time"> -- <_description>Set system time</_description> -- <_message>Authentication is required to set the system time.</_message> -+ <description>Set system time</description> -+ <message>Authentication is required to set the system time.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -28,8 +28,8 @@ - </action> - - <action id="org.freedesktop.timedate1.set-timezone"> -- <_description>Set system timezone</_description> -- <_message>Authentication is required to set the system timezone.</_message> -+ <description>Set system timezone</description> -+ <message>Authentication is required to set the system timezone.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -38,9 +38,9 @@ - </action> - - <action id="org.freedesktop.timedate1.set-local-rtc"> -- <_description>Set RTC to local timezone or UTC</_description> -- <_message>Authentication is required to control whether -- the RTC stores the local or UTC time.</_message> -+ <description>Set RTC to local timezone or UTC</description> -+ <message>Authentication is required to control whether -+ the RTC stores the local or UTC time.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> -@@ -49,9 +49,9 @@ - </action> - - <action id="org.freedesktop.timedate1.set-ntp"> -- <_description>Turn network time synchronization on or off</_description> -- <_message>Authentication is required to control whether -- network time synchronization shall be enabled.</_message> -+ <description>Turn network time synchronization on or off</description> -+ <message>Authentication is required to control whether -+ network time synchronization shall be enabled.</message> - <defaults> - <allow_any>auth_admin_keep</allow_any> - <allow_inactive>auth_admin_keep</allow_inactive> diff --git a/patches/systemd-235/0002-meson-do-not-include-man-meson.build-if-xsltproc-not.patch b/patches/systemd-235/0002-meson-do-not-include-man-meson.build-if-xsltproc-not.patch deleted file mode 100644 index f724c68df..000000000 --- a/patches/systemd-235/0002-meson-do-not-include-man-meson.build-if-xsltproc-not.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Tue, 31 Oct 2017 17:12:13 +0900 -Subject: [PATCH] meson: do not include man/meson.build if xsltproc not found - -Fixes #7232. ---- - man/meson.build | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/man/meson.build b/man/meson.build -index 7d28e6ba1ad5..e376bb8365b8 100644 ---- a/man/meson.build -+++ b/man/meson.build -@@ -32,7 +32,7 @@ custom_entities_ent = configure_file( - man_pages = [] - html_pages = [] - source_xml_files = [] --foreach tuple : manpages -+foreach tuple : want_man or want_html ? manpages : [] - stem = tuple[0] - section = tuple[1] - aliases = tuple[2] -@@ -115,8 +115,8 @@ systemd_index_xml = custom_target( - output : 'systemd.index.xml', - command : [make_man_index_py, '@OUTPUT@'] + nonindex_xml_files) - --foreach tuple : [['systemd.directives', '7', systemd_directives_xml], -- ['systemd.index', '7', systemd_index_xml]] -+foreach tuple : want_man or want_html ? [['systemd.directives', '7', systemd_directives_xml], -+ ['systemd.index', '7', systemd_index_xml]] : [] - stem = tuple[0] - section = tuple[1] - xml = tuple[2] diff --git a/patches/systemd-235/0003-meson-do-not-create-systemd-user-sessions.service-if.patch b/patches/systemd-235/0003-meson-do-not-create-systemd-user-sessions.service-if.patch deleted file mode 100644 index 51bc622ae..000000000 --- a/patches/systemd-235/0003-meson-do-not-create-systemd-user-sessions.service-if.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Tue, 31 Oct 2017 16:20:53 +0900 -Subject: [PATCH] meson: do not create systemd-user-sessions.service if PAM is - disabled - -Fixes #7227. ---- - units/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/units/meson.build b/units/meson.build -index 8494d23e9e40..1f4ed261a6d9 100644 ---- a/units/meson.build -+++ b/units/meson.build -@@ -209,7 +209,7 @@ in_units = [ - 'multi-user.target.wants/ graphical.target.wants/ rescue.target.wants/'], - ['systemd-update-utmp.service', 'ENABLE_UTMP', - 'sysinit.target.wants/'], -- ['systemd-user-sessions.service', '', -+ ['systemd-user-sessions.service', 'HAVE_PAM', - 'multi-user.target.wants/'], - ['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'], - ['systemd-volatile-root.service', ''], diff --git a/patches/systemd-235/series b/patches/systemd-235/series deleted file mode 100644 index fdcade551..000000000 --- a/patches/systemd-235/series +++ /dev/null @@ -1,6 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-i18n-drop-intltool-use-use-meson-s-merge_file-direct.patch -0002-meson-do-not-include-man-meson.build-if-xsltproc-not.patch -0003-meson-do-not-create-systemd-user-sessions.service-if.patch -# cccf8ceaeee467543076765c53e2a20a - git-ptx-patches magic diff --git a/projectroot/etc/fstab b/projectroot/etc/fstab index 0121c3076..269e35f66 100644 --- a/projectroot/etc/fstab +++ b/projectroot/etc/fstab @@ -14,3 +14,4 @@ tmpfs /run tmpfs nosuid,nodev,strictatime,mode=0755 0 0 tmpfs /var/log tmpfs nosuid,nodev,noexec,mode=0755,size=10% 0 0 tmpfs /var/lock tmpfs nosuid,nodev,noexec,mode=0755,size=1M 0 0 tmpfs /var/tmp tmpfs nosuid,nodev,mode=1777,size=20% 0 0 +tmpfs /var/lib/private tmpfs mode=0700,size=20% 0 0 diff --git a/projectroot/usr/lib/systemd/systemd-rc-once b/projectroot/usr/lib/systemd/systemd-rc-once index a1721de7f..2b9850d37 100644 --- a/projectroot/usr/lib/systemd/systemd-rc-once +++ b/projectroot/usr/lib/systemd/systemd-rc-once @@ -14,8 +14,8 @@ start() { systemctl daemon-reexec sleep 1 if [ -d /var/lib/systemd/timesync ]; then - touch /var/lib/systemd/clock - chown systemd-timesync:nogroup /var/lib/systemd/clock + touch /var/lib/systemd/timesync/clock + chown systemd-timesync:nogroup /var/lib/systemd/timesync/clock fi exec "$0" umount } diff --git a/rules/host-systemd.make b/rules/host-systemd.make index fc611fc2e..8040c6503 100644 --- a/rules/host-systemd.make +++ b/rules/host-systemd.make @@ -86,11 +86,13 @@ HOST_SYSTEMD_CONF_OPT := \ -Drfkill=false \ -Dseccomp=false \ -Dselinux=false \ + -Dslow-tests=false \ -Dsmack=false \ -Dsplit-usr=false \ -Dsystem-gid-max=999 \ -Dsystem-uid-max=999 \ -Dsysusers=false \ + -Dtests=true \ -Dtimedated=false \ -Dtimesyncd=false \ -Dtmpfiles=false \ @@ -113,8 +115,8 @@ $(STATEDIR)/host-systemd.install: @rm -rf $(HOST_SYSTEMD_PKGDIR) @install -vD -m755 $(HOST_SYSTEMD_DIR)-build/systemd-hwdb \ $(HOST_SYSTEMD_PKGDIR)/bin/systemd-hwdb - @install -vD -m755 $(HOST_SYSTEMD_DIR)-build/src/shared/libsystemd-shared-235.so \ - $(HOST_SYSTEMD_PKGDIR)/lib/libsystemd-shared-235.so + @install -vD -m755 $(HOST_SYSTEMD_DIR)-build/src/shared/libsystemd-shared-$(HOST_SYSTEMD_VERSION).so \ + $(HOST_SYSTEMD_PKGDIR)/lib/libsystemd-shared-$(HOST_SYSTEMD_VERSION).so @$(call touch) # vim: syntax=make diff --git a/rules/systemd.make b/rules/systemd.make index deaaa04a8..e80fb4d67 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd # # Paths and names # -SYSTEMD_VERSION := 235 -SYSTEMD_MD5 := d53a925f1ca5b2e124de0a8aa65d0db2 +SYSTEMD_VERSION := 236 +SYSTEMD_MD5 := 8609cb9043ac8f374371cbac5546acf4 SYSTEMD := systemd-$(SYSTEMD_VERSION) SYSTEMD_SUFFIX := tar.gz SYSTEMD_URL := https://github.com/systemd/systemd/archive/v$(SYSTEMD_VERSION).$(SYSTEMD_SUFFIX) @@ -76,6 +76,7 @@ SYSTEMD_CONF_OPT := \ -Dgcrypt=false \ -Dglib=false \ -Dgnutls=false \ + -Dgroup-render-mode=0666 \ -Dgshadow=false \ -Dhibernate=false \ -Dhostnamed=true \ @@ -123,6 +124,7 @@ SYSTEMD_CONF_OPT := \ -Dseccomp=$(call ptx/truefalse,PTXCONF_SYSTEMD_SECCOMP) \ -Dselinux=$(call ptx/truefalse,PTXCONF_GLOBAL_SELINUX) \ -Dsetfont-path=/usr/bin/setfont \ + -Dslow-tests=false \ -Dsmack=false \ -Dsplit-usr=false \ -Dsulogin-path=/sbin/sulogin \ @@ -130,6 +132,7 @@ SYSTEMD_CONF_OPT := \ -Dsystem-uid-max=999 \ -Dsysusers=false \ -Dtelinit-path=/usr/bin/telinit \ + -Dtests=true \ -Dtime-epoch=`date --date "$(PTXDIST_VERSION_YEAR)-$(PTXDIST_VERSION_MONTH)-01 UTC" +%s` \ -Dtimedated=$(call ptx/truefalse,PTXCONF_SYSTEMD_TIMEDATE) \ -Dtimesyncd=$(call ptx/truefalse,PTXCONF_SYSTEMD_TIMEDATE) \ @@ -137,6 +140,7 @@ SYSTEMD_CONF_OPT := \ -Dtpm=false \ -Dtty-gid=112 \ -Dumount-path=/usr/bin/umount \ + -Dusers-gid= \ -Dutmp=false \ -Dvconsole=$(call ptx/truefalse,PTXCONF_SYSTEMD_VCONSOLE) \ -Dwheel-group=false \ @@ -377,12 +381,13 @@ ifdef PTXCONF_SYSTEMD_VCONSOLE endif @$(call install_copy, systemd, 0, 0, 0755, /var/lib/systemd) + @$(call install_copy, systemd, 0, 0, 0700, /var/lib/private) # # systemd expects this directory to exist. @$(call install_copy, systemd, 0, 0, 0755, /var/lib/systemd/coredump) @$(call install_copy, systemd, 0, 0, 0700, /var/lib/machines) ifdef PTXCONF_SYSTEMD_TIMEDATE - @$(call install_copy, systemd, systemd-timesync, nogroup, 0755, \ + @$(call install_link, systemd, ../private/systemd/timesync, \ /var/lib/systemd/timesync) endif |