[ptxdist] [PATCH] systemd: version bump 245.6 -> 246

[Robert Schwebel <r.schwebel@pengutronix.de>]

A new systemd version is out.

* There is a new config otpion for zstd compression for the journal.
* Several new and obsolete meson options have been adapted.
* As systemd-initctl is only installed if sysvinit support is enabled
  (and we don't do that), remove it from targetinstall.
* As systemd-volatile-root is only installed if the initrd support
  is built, remove it from targetinstall.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 rules/systemd.in   |  5 +++++
 rules/systemd.make | 21 ++++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/rules/systemd.in b/rules/systemd.in
index 461238813..bd848b372 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -21,6 +21,7 @@ menuconfig SYSTEMD
 	select MACHINE_ID	if RUNTIME
 	select XZ		if SYSTEMD_XZ
 	select LZ4		if SYSTEMD_LZ4
+	select ZSTD		if SYSTEMD_ZSTD
 	select LIBMICROHTTPD	if SYSTEMD_MICROHTTPD
 	select LIBSECCOMP	if SYSTEMD_SECCOMP
 	select LIBSELINUX	if GLOBAL_SELINUX
@@ -133,6 +134,10 @@ config SYSTEMD_LZ4
 	bool
 	prompt "LZ4 compressed journal support"
 
+config SYSTEMD_ZSTD
+	bool
+	prompt "ZSTD compressed journal support"
+
 config SYSTEMD_JOURNAL_REMOTE
 	bool
 	select SYSTEMD_MICROHTTPD
diff --git a/rules/systemd.make b/rules/systemd.make
index 840b44b47..45488e34e 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd
 #
 # Paths and names
 #
-SYSTEMD_VERSION		:= 245.6
+SYSTEMD_VERSION		:= 246
 SYSTEMD_VERSION_MAJOR	:= $(firstword $(subst -, ,$(subst ., ,$(SYSTEMD_VERSION))))
-SYSTEMD_MD5		:= 1eb3ca8f77978cc52dea6293467211a8
+SYSTEMD_MD5		:= a3e9efa72d0309dd26513a221cdff31b
 SYSTEMD			:= systemd-$(SYSTEMD_VERSION)
 SYSTEMD_SUFFIX		:= tar.gz
 ifeq ($(SYSTEMD_VERSION),$(SYSTEMD_VERSION_MAJOR))
@@ -52,6 +52,7 @@ SYSTEMD_CONF_OPT	:= \
 	$(CROSS_MESON_USR) \
 	-Dacl=$(call ptx/truefalse,PTXCONF_SYSTEMD_UNITS_USER) \
 	-Dadm-group=true \
+	-Danalyze=true \
 	-Dapparmor=false \
 	-Daudit=false \
 	-Dbacklight=false \
@@ -72,7 +73,9 @@ SYSTEMD_CONF_OPT	:= \
 	-Ddefault-dnssec=no \
 	-Ddefault-hierarchy=unified \
 	-Ddefault-kill-user-processes=true \
+	-Ddefault-llmnr=yes \
 	-Ddefault-locale=C \
+	-Ddefault-mdns=yes \
 	-Ddefault-net-naming-scheme=latest \
 	-Ddev-kvm-mode=0660 \
 	-Ddns-over-tls=false \
@@ -83,7 +86,7 @@ SYSTEMD_CONF_OPT	:= \
 	-Dfallback-hostname=$(call ptx/ifdef,PTXCONF_ROOTFS_ETC_HOSTNAME,$(PTXCONF_ROOTFS_ETC_HOSTNAME),ptxdist) \
 	-Dfdisk=false \
 	-Dfirstboot=false \
-	-Dfuzzbuzz=false \
+	-Dfuzz-tests=false \
 	-Dgcrypt=false \
 	-Dglib=false \
 	-Dgnutls=false \
@@ -97,13 +100,16 @@ SYSTEMD_CONF_OPT	:= \
 	-Didn=false \
 	-Dima=false \
 	-Dimportd=false \
+	-Dinitrd=false \
 	-Dinstall-tests=false \
+	-Dkernel-install=false \
 	-Dkexec-path=/usr/sbin/kexec \
 	-Dkmod=true \
 	-Dkmod-path=/usr/bin/kmod \
 	-Dldconfig=false \
 	-Dlibcryptsetup=false \
 	-Dlibcurl=false \
+	-Dlibfido2=false \
 	-Dlibidn=false \
 	-Dlibidn2=false \
 	-Dlibiptc=$(call ptx/truefalse,PTXCONF_SYSTEMD_IPMASQUERADE) \
@@ -159,6 +165,7 @@ SYSTEMD_CONF_OPT	:= \
 	-Dsplit-usr=false \
 	-Dstatic-libsystemd=false \
 	-Dstatic-libudev=false \
+	-Dstandalone-binaries=false \
 	-Dstatus-unit-format-default=name \
 	-Dsulogin-path=/sbin/sulogin \
 	-Dsupport-url=https://www.ptxdist.org/ \
@@ -182,10 +189,12 @@ SYSTEMD_CONF_OPT	:= \
 	-Dvalgrind=false \
 	-Dvconsole=$(call ptx/truefalse,PTXCONF_SYSTEMD_VCONSOLE) \
 	-Dversion-tag=$(SYSTEMD_VERSION) \
+	-Dxdg-autostart=false \
 	-Dwheel-group=false \
 	-Dxkbcommon=false \
 	-Dxz=$(call ptx/truefalse,PTXCONF_SYSTEMD_XZ) \
-	-Dzlib=false
+	-Dzlib=false \
+	-Dzstd=$(call ptx/truefalse,PTXCONF_SYSTEMD_ZSTD)
 
 # FIXME kernel from systemd README:
 # - devtmpfs, cgroups are mandatory.
@@ -230,7 +239,6 @@ SYSTEMD_HELPER := \
 	systemd-fsck \
 	systemd-growfs \
 	systemd-hostnamed \
-	systemd-initctl \
 	systemd-journald \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_JOURNAL_REMOTE,systemd-journal-remote) \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed) \
@@ -255,8 +263,7 @@ SYSTEMD_HELPER := \
 	systemd-udevd \
 	systemd-update-done \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_UNITS_USER,systemd-user-runtime-dir) \
-	$(call ptx/ifdef, PTXCONF_SYSTEMD_VCONSOLE,systemd-vconsole-setup) \
-	systemd-volatile-root
+	$(call ptx/ifdef, PTXCONF_SYSTEMD_VCONSOLE,systemd-vconsole-setup)
 
 SYSTEMD_UDEV_HELPER-y :=
 
-- 
2.27.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de