systemd: version bump 232 -> 233

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

16 files changed, 36 insertions, 30 deletions

diff --git a/patches/systemd-232/0001-missing-defined-extra-clock-ids.patch b/patches/systemd-233/0001-missing-defined-extra-clock-ids.patch
index 2054b1d6a..2958ebd33 100644
--- a/patches/systemd-232/0001-missing-defined-extra-clock-ids.patch
+++ b/patches/systemd-233/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 4c013be608df..71e26ee8edb4 100644
+index 480462357de9..93132b49787e 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -893,6 +893,16 @@ struct btrfs_ioctl_quota_ctl_args {
+@@ -915,6 +915,16 @@ struct btrfs_ioctl_quota_ctl_args {
  #define RTA_PREF 20
  #endif
  
diff --git a/patches/systemd-232/0002-missing-add-BPF_XOR.patch b/patches/systemd-233/0002-missing-add-BPF_XOR.patch
index caa63e5e6..e9c7e7c83 100644
--- a/patches/systemd-232/0002-missing-add-BPF_XOR.patch
+++ b/patches/systemd-233/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 71e26ee8edb4..963a5b89a6e6 100644
+index 93132b49787e..b6fd994fe017 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -959,6 +959,10 @@ struct btrfs_ioctl_quota_ctl_args {
+@@ -981,6 +981,10 @@ struct btrfs_ioctl_quota_ctl_args {
  #  define BPF_XOR 0xa0
  #endif
  
diff --git a/patches/systemd-232/0003-missing-define-__NR_kcmp-if-necessary.patch b/patches/systemd-233/0003-missing-define-__NR_kcmp-if-necessary.patch
index b084f11ad..cd9ac92a1 100644
--- a/patches/systemd-232/0003-missing-define-__NR_kcmp-if-necessary.patch
+++ b/patches/systemd-233/0003-missing-define-__NR_kcmp-if-necessary.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_syscall.h b/src/basic/missing_syscall.h
-index e6fd67cb9d2e..a471af08d311 100644
+index 9fc415656456..01cae2610cae 100644
 --- a/src/basic/missing_syscall.h
 +++ b/src/basic/missing_syscall.h
-@@ -223,6 +223,10 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
+@@ -225,6 +225,10 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
  
  /* ======================================================================= */
  
diff --git a/patches/systemd-232/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch b/patches/systemd-233/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
index 7439be3ea..dc19bfaa7 100644
--- a/patches/systemd-232/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
+++ b/patches/systemd-233/0004-missing-define-O_PATH-and-AT_EMPTY_PATH.patch
@@ -13,10 +13,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  2 files changed, 8 insertions(+)
 
 diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 963a5b89a6e6..568676b7bb6e 100644
+index b6fd994fe017..f4dcf3056e90 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -903,6 +903,13 @@ struct btrfs_ioctl_quota_ctl_args {
+@@ -925,6 +925,13 @@ struct btrfs_ioctl_quota_ctl_args {
  #define CLOCK_BOOTTIME_ALARM 9
  #endif
  
diff --git a/patches/systemd-232/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch b/patches/systemd-233/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch
index 20342272d..ba13ef27b 100644
--- a/patches/systemd-232/0005-HACK-configure.ac-disable-NLS-to-avoid-unnecessary-d.patch
+++ b/patches/systemd-233/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 0b10fc7de771..d70b89893844 100644
+index 3835413ad59e..0870c1cd2cd8 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -59,6 +59,7 @@ SET_ARCH(IA32, i*86*)
diff --git a/patches/systemd-232/0006-missing-define-syncfs.patch b/patches/systemd-233/0006-missing-define-syncfs.patch
index a158ab041..1fe61a3a3 100644
--- a/patches/systemd-232/0006-missing-define-syncfs.patch
+++ b/patches/systemd-233/0006-missing-define-syncfs.patch
@@ -13,10 +13,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  2 files changed, 9 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index d70b89893844..95bd19c7927e 100644
+index 0870c1cd2cd8..3b6e8959bdcd 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -313,6 +313,7 @@ AC_CHECK_DECLS([
+@@ -334,6 +334,7 @@ AC_CHECK_DECLS([
          pivot_root,
          name_to_handle_at,
          setns,
@@ -25,10 +25,10 @@ index d70b89893844..95bd19c7927e 100644
          renameat2,
          kcmp,
 diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 568676b7bb6e..0b5ce1fde036 100644
+index f4dcf3056e90..d32f9ca0c333 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -910,6 +910,14 @@ struct btrfs_ioctl_quota_ctl_args {
+@@ -932,6 +932,14 @@ struct btrfs_ioctl_quota_ctl_args {
  #define AT_EMPTY_PATH	0x1000	/* Allow empty relative pathname */
  #endif
  
diff --git a/patches/systemd-232/0007-missing-add-more-btrfs-defines.patch b/patches/systemd-233/0007-missing-add-more-btrfs-defines.patch
index 212054fc3..60251bdc9 100644
--- a/patches/systemd-232/0007-missing-add-more-btrfs-defines.patch
+++ b/patches/systemd-233/0007-missing-add-more-btrfs-defines.patch
@@ -8,10 +8,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 37 insertions(+)
 
 diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 0b5ce1fde036..d1e10345a36f 100644
+index d32f9ca0c333..4581408effe4 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -310,6 +310,23 @@ struct btrfs_ioctl_quota_ctl_args {
+@@ -332,6 +332,23 @@ struct btrfs_ioctl_quota_ctl_args {
          __u64 cmd;
          __u64 status;
  };
@@ -35,7 +35,7 @@ index 0b5ce1fde036..d1e10345a36f 100644
  #endif
  
  #ifndef BTRFS_IOC_DEFRAG
-@@ -384,11 +401,31 @@ struct btrfs_ioctl_quota_ctl_args {
+@@ -406,11 +423,31 @@ struct btrfs_ioctl_quota_ctl_args {
                                 struct btrfs_ioctl_quota_ctl_args)
  #endif
  
diff --git a/patches/systemd-232/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch b/patches/systemd-233/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch
index f75dd8613..f75dd8613 100644
--- a/patches/systemd-232/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch
+++ b/patches/systemd-233/0008-HACK-include-missing.h-in-btrfs-ctree.h-for-BTRFS_UU.patch
diff --git a/patches/systemd-232/0009-HACK-add-local-copy-of-uchar.h.patch b/patches/systemd-233/0009-HACK-add-local-copy-of-uchar.h.patch
index 61809b2c8..37ae6fbd8 100644
--- a/patches/systemd-232/0009-HACK-add-local-copy-of-uchar.h.patch
+++ b/patches/systemd-233/0009-HACK-add-local-copy-of-uchar.h.patch
@@ -15,13 +15,13 @@ 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 95bd19c7927e..47f8a4a9a984 100644
+index 3b6e8959bdcd..0307ada56aba 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -295,6 +295,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
- AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
+@@ -316,6 +316,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
@@ -123,12 +123,12 @@ index deaa4def2828..36d437cfaa2f 100644
  #include "string-util.h"
  #include "missing.h"
 diff --git a/src/basic/missing.h b/src/basic/missing.h
-index d1e10345a36f..fbe2e26e0132 100644
+index 4581408effe4..747d832fa3a2 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -35,7 +35,11 @@
- #include <stdlib.h>
+@@ -36,7 +36,11 @@
  #include <sys/resource.h>
+ #include <sys/socket.h>
  #include <sys/syscall.h>
 +#ifdef HAVE_UCHAR_H
  #include <uchar.h>
diff --git a/patches/systemd-232/0010-HACK-fix-building-without-linux-sctp.h.patch b/patches/systemd-233/0010-HACK-fix-building-without-linux-sctp.h.patch
index 05f69475b..6c3657340 100644
--- a/patches/systemd-232/0010-HACK-fix-building-without-linux-sctp.h.patch
+++ b/patches/systemd-233/0010-HACK-fix-building-without-linux-sctp.h.patch
@@ -13,12 +13,12 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  2 files changed, 8 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 47f8a4a9a984..e82236e6027b 100644
+index 0307ada56aba..d81c1d9e81c4 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -296,6 +296,10 @@ AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers n
- AC_CHECK_HEADERS([linux/btrfs.h], [], [])
+@@ -317,6 +317,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>
@@ -28,7 +28,7 @@ index 47f8a4a9a984..e82236e6027b 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 0b1c4acfecd0..fc61bbd49b7b 100644
+index c4da227e0931..78f5c8026ac2 100644
 --- a/src/core/socket.c
 +++ b/src/core/socket.c
 @@ -26,7 +26,11 @@
diff --git a/patches/systemd-232/0011-missing-add-SMACK_MAGIC-EFIVARFS_MAGIC-BINFMTFS_MAGI.patch b/patches/systemd-233/0011-missing-add-SMACK_MAGIC-EFIVARFS_MAGIC-BINFMTFS_MAGI.patch
index 78ead89ba..f9fb03c71 100644
--- a/patches/systemd-232/0011-missing-add-SMACK_MAGIC-EFIVARFS_MAGIC-BINFMTFS_MAGI.patch
+++ b/patches/systemd-233/0011-missing-add-SMACK_MAGIC-EFIVARFS_MAGIC-BINFMTFS_MAGI.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 fbe2e26e0132..b875be52d299 100644
+index 747d832fa3a2..360591c494c7 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -959,6 +959,16 @@ static inline int syncfs(int fd)
+@@ -981,6 +981,16 @@ static inline int syncfs(int fd)
  }
  #endif
  
diff --git a/patches/systemd-232/autogen.sh b/patches/systemd-233/autogen.sh
index cbfab1ee7..cbfab1ee7 100755
--- a/patches/systemd-232/autogen.sh
+++ b/patches/systemd-233/autogen.sh
diff --git a/patches/systemd-232/series b/patches/systemd-233/series
index 9a20226b9..9a20226b9 100644
--- a/patches/systemd-232/series
+++ b/patches/systemd-233/series
diff --git a/projectroot/lib/systemd/system/rc-once.service b/projectroot/lib/systemd/system/rc-once.service
index 550a0188e..78f6f4c48 100644
--- a/projectroot/lib/systemd/system/rc-once.service
+++ b/projectroot/lib/systemd/system/rc-once.service
@@ -4,6 +4,7 @@ DefaultDependencies=no
 IgnoreOnIsolate=true
 After=local-fs.target
 Requires=local-fs.target
+Before=system-update-cleanup.service
 After=system-update.target
 
 [Service]
diff --git a/rules/systemd.make b/rules/systemd.make
index 3a25dd7fa..72cd6d0f9 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd
 #
 # Paths and names
 #
-SYSTEMD_VERSION	:= 232
-SYSTEMD_MD5	:= 3e3a0b14050eff62e68be72142181730
+SYSTEMD_VERSION	:= 233
+SYSTEMD_MD5	:= 11d3ff48f3361b8bdcfcdc076a31b537
 SYSTEMD		:= systemd-$(SYSTEMD_VERSION)
 SYSTEMD_SUFFIX	:= tar.gz
 SYSTEMD_URL	:= https://github.com/systemd/systemd/archive/v$(SYSTEMD_VERSION).$(SYSTEMD_SUFFIX)
@@ -97,6 +97,7 @@ SYSTEMD_CONF_OPT	:= \
 	--$(call ptx/endis,PTXCONF_SYSTEMD_VCONSOLE)-vconsole \
 	--enable-quotacheck \
 	--enable-tmpfiles \
+	--disable-environment-d \
 	--disable-sysusers \
 	--disable-firstboot \
 	--$(call ptx/disen,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED)-randomseed \
@@ -127,6 +128,8 @@ SYSTEMD_CONF_OPT	:= \
 	--without-python \
 	--with-nobody-user=nobody \
 	--with-nobody-group=nogroup \
+	--with-fallback-hostname=$(call ptx/ifdef,PTXCONF_ROOTFS_ETC_HOSTNAME,$(PTXCONF_ROOTFS_ETC_HOSTNAME),ptxdist) \
+	--with-default-hierarchy=hybrid \
 	--with-ntp-servers= \
 	--with-time-epoch=`date --date "$(PTXDIST_VERSION_YEAR)-$(PTXDIST_VERSION_MONTH)-01 UTC" +%s` \
 	--with-system-uid-max=999 \
@@ -260,6 +263,7 @@ endif
 	@$(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)
+	@$(call install_link, systemd, systemd-mount, /usr/bin/systemd-umount)
 ifdef PTXCONF_SYSTEMD_TIMEDATE
 	@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/timedatectl)
 endif
diff --git a/rules/udev.make b/rules/udev.make
index c6df5c5b9..f2177d7c2 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -107,6 +107,7 @@ endif
 UDEV_RULES-$(PTXCONF_SYSTEMD) += \
 	60-block.rules \
 	60-drm.rules \
+	60-sensor.rules \
 	60-serial.rules \
 	64-btrfs.rules \
 	70-mouse.rules \