systemd: version bump 247.3 -> 248

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

2 files changed, 43 insertions, 8 deletions

diff --git a/rules/host-systemd.make b/rules/host-systemd.make
index 58477a53a..42409d7b5 100644
--- a/rules/host-systemd.make
+++ b/rules/host-systemd.make
@@ -16,17 +16,20 @@ HOST_PACKAGES-$(PTXCONF_HOST_SYSTEMD) += host-systemd
 # ----------------------------------------------------------------------------
 
 HOST_SYSTEMD_CONF_TOOL	:= meson
+# prefix=/usr is needed for systemd-hwdb to work correctly
 HOST_SYSTEMD_CONF_OPT	:= \
 	$(HOST_MESON_OPT) \
+	-Dprefix=/usr \
 	-Dacl=false \
 	-Dadm-group=true \
+	-Danalyze=false \
 	-Dapparmor=false \
 	-Daudit=false \
 	-Dbacklight=false \
 	-Dbinfmt=false \
 	-Dblkid=false \
 	-Dbzip2=false \
-	-Dcompat-gateway-hostname=false \
+	-Dcompat-mutable-uid-boundaries=false \
 	-Dcoredump=false \
 	-Dcreate-log-dirs=false \
 	-Ddbus=false \
@@ -37,35 +40,49 @@ HOST_SYSTEMD_CONF_OPT	:= \
 	-Ddefault-dnssec=no \
 	-Ddefault-hierarchy=unified \
 	-Ddefault-kill-user-processes=true \
+	-Ddefault-llmnr=no \
+	-Ddefault-locale=C \
+	-Ddefault-mdns=no \
+	-Ddefault-net-naming-scheme=latest \
 	-Ddev-kvm-mode=0660 \
 	-Ddns-over-tls=false \
 	-Ddns-servers= \
 	-Defi=false \
 	-Delfutils=false \
 	-Denvironment-d=false \
+	-Dfallback-hostname=localhost \
+	-Dfdisk=false \
+	-Dfexecve=false \
 	-Dfirstboot=false \
-	-Dfuzzbuzz=false \
+	-Dfuzz-tests=false \
 	-Dgcrypt=false \
 	-Dglib=false \
 	-Dgnutls=false \
 	-Dgroup-render-mode=0666 \
 	-Dgshadow=false \
 	-Dhibernate=false \
+	-Dhomed=false \
 	-Dhostnamed=false \
 	-Dhtml=false \
 	-Dhwdb=true \
 	-Didn=false \
 	-Dima=false \
 	-Dimportd=false \
+	-Dinitrd=false \
+	-Dinstall-sysconfdir=false \
 	-Dinstall-tests=false \
+	-Dkernel-install=false \
 	-Dkmod=false \
 	-Dldconfig=false \
 	-Dlibcryptsetup=false \
 	-Dlibcurl=false \
+	-Dlibfido2=false \
 	-Dlibidn=false \
 	-Dlibidn2=false \
 	-Dlibiptc=false \
+	-Dlink-networkd-shared=true \
 	-Dlink-systemctl-shared=true \
+	-Dlink-timesyncd-shared=true \
 	-Dlink-udev-shared=true \
 	-Dllvm-fuzz=false \
 	-Dlocaled=false \
@@ -76,26 +93,32 @@ HOST_SYSTEMD_CONF_OPT	:= \
 	-Dman=false \
 	-Dmemory-accounting-default=false \
 	-Dmicrohttpd=false \
+	-Dmode=release \
 	-Dnetworkd=false \
 	-Dnobody-group=nobody \
 	-Dnobody-user=nobody \
+	-Dnscd=false \
 	-Dnss-myhostname=false \
 	-Dnss-mymachines=false \
 	-Dnss-resolve=false \
 	-Dnss-systemd=false \
 	-Dntp-servers= \
 	-Dok-color=green \
+	-Doomd=false \
 	-Dopenssl=false \
 	-Doss-fuzz=false \
+	-Dp11kit=false \
 	-Dpam=false \
 	-Dpcre2=false \
 	-Dpolkit=false \
 	-Dportabled=false \
 	-Dpstore=false \
+	-Dpwquality=false \
 	-Dqrencode=false \
 	-Dquotacheck=false \
 	-Drandomseed=false \
 	-Dremote=false \
+	-Drepart=false \
 	-Dresolve=false \
 	-Drfkill=false \
 	-Dseccomp=false \
@@ -104,9 +127,11 @@ HOST_SYSTEMD_CONF_OPT	:= \
 	-Dsmack=false \
 	-Dsplit-bin=true \
 	-Dsplit-usr=false \
+	-Dstandalone-binaries=false \
 	-Dstatic-libsystemd=false \
 	-Dstatic-libudev=false \
 	-Dstatus-unit-format-default=name \
+	-Dsysext=false \
 	-Dsystem-gid-max=999 \
 	-Dsystem-uid-max=999 \
 	-Dsysusers=false \
@@ -118,14 +143,19 @@ HOST_SYSTEMD_CONF_OPT	:= \
 	-Dtimesyncd=false \
 	-Dtmpfiles=false \
 	-Dtpm=false \
+	-Dtpm2=false \
+	-Dtranslations=false \
+	-Duserdb=false \
 	-Dutmp=false \
 	-Dvalgrind=false \
 	-Dvconsole=false \
 	-Dversion-tag=$(HOST_SYSTEMD_VERSION) \
 	-Dwheel-group=false \
+	-Dxdg-autostart=false \
 	-Dxkbcommon=false \
 	-Dxz=false \
-	-Dzlib=false
+	-Dzlib=false \
+	-Dzstd=false
 
 HOST_SYSTEMD_MAKE_OPT := systemd-hwdb
 
diff --git a/rules/systemd.make b/rules/systemd.make
index 8e80b8bcb..3a3621fe7 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd
 #
 # Paths and names
 #
-SYSTEMD_VERSION		:= 247.3
+SYSTEMD_VERSION		:= 248
 SYSTEMD_VERSION_MAJOR	:= $(firstword $(subst -, ,$(subst ., ,$(SYSTEMD_VERSION))))
-SYSTEMD_MD5		:= 5be57c584847b161c67577f2d997903a
+SYSTEMD_MD5		:= 00131adf0e98c1fd8a7fde4eb47f10c8
 SYSTEMD			:= systemd-$(SYSTEMD_VERSION)
 SYSTEMD_SUFFIX		:= tar.gz
 ifeq ($(SYSTEMD_VERSION),$(SYSTEMD_VERSION_MAJOR))
@@ -62,7 +62,6 @@ SYSTEMD_CONF_OPT	:= \
 	-Dbump-proc-sys-fs-nr-open=true \
 	-Dbzip2=false \
 	-Dcertificate-root=/etc/ssl \
-	-Dcompat-gateway-hostname=false \
 	-Dcompat-mutable-uid-boundaries=false \
 	-Dcoredump=$(call ptx/truefalse,PTXCONF_SYSTEMD_COREDUMP) \
 	-Dcreate-log-dirs=false \
@@ -86,6 +85,7 @@ SYSTEMD_CONF_OPT	:= \
 	-Denvironment-d=false \
 	-Dfallback-hostname=$(call ptx/ifdef,PTXCONF_ROOTFS_ETC_HOSTNAME,$(PTXCONF_ROOTFS_ETC_HOSTNAME),ptxdist) \
 	-Dfdisk=false \
+	-Dfexecve=false \
 	-Dfirstboot=false \
 	-Dfuzz-tests=false \
 	-Dgcrypt=false \
@@ -134,6 +134,7 @@ SYSTEMD_CONF_OPT	:= \
 	-Dnetworkd=$(call ptx/truefalse,PTXCONF_SYSTEMD_NETWORK) \
 	-Dnobody-group=nogroup \
 	-Dnobody-user=nobody \
+	-Dnscd=false \
 	-Dnss-myhostname=true \
 	-Dnss-mymachines=false \
 	-Dnss-resolve=$(call ptx/truefalse,PTXCONF_SYSTEMD_NETWORK) \
@@ -167,12 +168,13 @@ SYSTEMD_CONF_OPT	:= \
 	-Dsmack=false \
 	-Dsplit-bin=true \
 	-Dsplit-usr=false \
+	-Dstandalone-binaries=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/ \
+	-Dsysext=false \
 	-Dsystem-alloc-gid-min=1 \
 	-Dsystem-alloc-uid-min=1 \
 	-Dsystem-gid-max=999 \
@@ -187,6 +189,7 @@ SYSTEMD_CONF_OPT	:= \
 	-Dtimesyncd=$(call ptx/truefalse,PTXCONF_SYSTEMD_TIMEDATE) \
 	-Dtmpfiles=true \
 	-Dtpm=false \
+	-Dtpm2=false \
 	-Dtty-gid=112 \
 	-Dumount-path=/usr/bin/umount \
 	-Duserdb=false \
@@ -195,8 +198,8 @@ SYSTEMD_CONF_OPT	:= \
 	-Dvalgrind=false \
 	-Dvconsole=$(call ptx/truefalse,PTXCONF_SYSTEMD_VCONSOLE) \
 	-Dversion-tag=$(SYSTEMD_VERSION) \
-	-Dxdg-autostart=false \
 	-Dwheel-group=false \
+	-Dxdg-autostart=false \
 	-Dxkbcommon=false \
 	-Dxz=$(call ptx/truefalse,PTXCONF_SYSTEMD_XZ) \
 	-Dzlib=false \
@@ -276,6 +279,7 @@ SYSTEMD_UDEV_HELPER-y :=
 
 SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_ATA)	+= ata_id
 SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_CDROM)	+= cdrom_id
+SYSTEMD_UDEV_HELPER-$(PTXCONF_ARCH_X86)				+= dmi_memory_id
 SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_FIDO)	+= fido_id
 SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_SCSI)	+= scsi_id
 SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_V4L)	+= v4l_id
@@ -316,6 +320,7 @@ SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_VCONSOLE) += \
 SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_CDROM)	+= 60-cdrom_id.rules
 SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_FIDO)	+= 60-fido-id.rules
 SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_V4L)	+= 60-persistent-v4l.rules
+SYSTEMD_UDEV_RULES-$(PTXCONF_ARCH_X86)				+= 70-memory.rules
 SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_MTD_PROBE)		+= 75-probe_mtd.rules
 SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_DRIVERS_RULES)	+= 80-drivers.rules