systemd: version bump 234 -> 235

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

1 files changed, 97 insertions, 89 deletions

diff --git a/rules/host-systemd.make b/rules/host-systemd.make
index a2e70867a..fc611fc2e 100644
--- a/rules/host-systemd.make
+++ b/rules/host-systemd.make
@@ -17,96 +17,104 @@ HOST_PACKAGES-$(PTXCONF_HOST_SYSTEMD) += host-systemd
 # Prepare
 # ----------------------------------------------------------------------------
 
-HOST_SYSTEMD_CONF_ENV	:= \
-	$(HOST_ENV) \
-	AR=ar NM=nm RANLIB=ranlib \
-	cc_cv_LDFLAGS__Wl___gc_sections=no \
-	cc_cv_CFLAGS__Werror_shadow=no \
-	ac_cv_path_INTLTOOL_MERGE=:
+# FIXME: disable intltool-merge
+# https://github.com/systemd/systemd/issues/7300
 
-#
-# autoconf
-#
-HOST_SYSTEMD_CONF_TOOL	:= autoconf
+HOST_SYSTEMD_CONF_TOOL	:= meson
 HOST_SYSTEMD_CONF_OPT	:= \
-	$(HOST_AUTOCONF) \
-	--enable-silent-rules \
-	--disable-static \
-	--disable-address-sanitizer \
-	--disable-undefined-sanitizer \
-	--disable-lto \
-	--disable-dbus \
-	--disable-glib \
-	--disable-utmp \
-	--disable-coverage \
-	--disable-kmod \
-	--disable-xkbcommon \
-	--disable-blkid \
-	--disable-seccomp \
-	--disable-ima \
-	--disable-selinux \
-	--disable-apparmor \
-	--disable-adm-group \
-	--disable-wheel-group \
-	--disable-xz \
-	--disable-zlib \
-	--disable-bzip2 \
-	--disable-lz4 \
-	--disable-pam \
-	--disable-acl \
-	--disable-smack \
-	--disable-gcrypt \
-	--disable-audit \
-	--disable-elfutils \
-	--disable-libcryptsetup \
-	--disable-qrencode \
-	--disable-gnutls \
-	--disable-microhttpd \
-	--disable-libcurl \
-	--disable-libidn \
-	--disable-libidn2 \
-	--disable-idn \
-	--disable-nss-systemd \
-	--disable-libiptc \
-	--disable-binfmt \
-	--disable-vconsole \
-	--disable-quotacheck \
-	--disable-tmpfiles \
-	--disable-environment-d \
-	--disable-sysusers \
-	--disable-gshadow \
-	--disable-firstboot \
-	--disable-randomseed \
-	--disable-backlight \
-	--disable-rfkill \
-	--disable-logind \
-	--disable-machined \
-	--disable-importd \
-	--disable-hostnamed \
-	--disable-timedated \
-	--disable-timesyncd \
-	--disable-localed \
-	--disable-coredump \
-	--disable-polkit \
-	--disable-resolved \
-	--disable-networkd \
-	--disable-efi \
-	--disable-gnuefi \
-	--disable-tpm \
-	--disable-myhostname \
-	--enable-hwdb \
-	--disable-manpages \
-	--disable-hibernate \
-	--disable-ldconfig \
-	--enable-split-usr \
-	--disable-tests \
-	--disable-debug \
-	--without-python \
-	--with-ntp-servers= \
-	--with-dns-servers= \
-	--with-sysvinit-path="" \
-	--with-sysvrcnd-path="" \
-	--with-rootprefix=/usr \
-	--with-rootlibdir=/lib
+	$(HOST_MESON_OPT) \
+	-Dacl=false \
+	-Dadm-group=true \
+	-Dapparmor=false \
+	-Daudit=false \
+	-Dbacklight=false \
+	-Dbinfmt=false \
+	-Dblkid=false \
+	-Dbzip2=false \
+	-Dcompat-gateway-hostname=false \
+	-Dcoredump=false \
+	-Ddbus=false \
+	-Ddebug=false \
+	-Ddefault-dnssec=allow-downgrade \
+	-Ddefault-hierarchy=hybrid \
+	-Ddefault-kill-user-processes=true \
+	-Ddev-kvm-mode=0660 \
+	-Ddns-servers= \
+	-Defi=false \
+	-Delfutils=false \
+	-Denvironment-d=false \
+	-Dfirstboot=false \
+	-Dgcrypt=false \
+	-Dglib=false \
+	-Dgnutls=false \
+	-Dgshadow=false \
+	-Dhibernate=false \
+	-Dhostnamed=false \
+	-Dhtml=false \
+	-Dhwdb=true \
+	-Didn=false \
+	-Dima=false \
+	-Dimportd=false \
+	-Dinstall-tests=false \
+	-Dkmod=false \
+	-Dldconfig=false \
+	-Dlibcryptsetup=false \
+	-Dlibcurl=false \
+	-Dlibidn=false \
+	-Dlibidn2=false \
+	-Dlibiptc=false \
+	-Dlink-udev-shared=true \
+	-Dlocaled=false \
+	-Dlogind=false \
+	-Dlz4=false \
+	-Dmachined=false \
+	-Dman=false \
+	-Dmicrohttpd=false \
+	-Dmyhostname=false \
+	-Dnetworkd=false \
+	-Dnobody-group=nobody \
+	-Dnobody-user=nobody \
+	-Dnss-systemd=false \
+	-Dntp-servers= \
+	-Dpam=false \
+	-Dpolkit=false \
+	-Dqrencode=false \
+	-Dquotacheck=false \
+	-Drandomseed=false \
+	-Dremote=false \
+	-Dresolve=false \
+	-Drfkill=false \
+	-Dseccomp=false \
+	-Dselinux=false \
+	-Dsmack=false \
+	-Dsplit-usr=false \
+	-Dsystem-gid-max=999 \
+	-Dsystem-uid-max=999 \
+	-Dsysusers=false \
+	-Dtimedated=false \
+	-Dtimesyncd=false \
+	-Dtmpfiles=false \
+	-Dtpm=false \
+	-Dutmp=false \
+	-Dvconsole=false \
+	-Dwheel-group=false \
+	-Dxkbcommon=false \
+	-Dxz=false \
+	-Dzlib=false
+
+HOST_SYSTEMD_MAKE_OPT := systemd-hwdb
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-systemd.install:
+	@$(call targetinfo)
+	@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
+	@$(call touch)
 
 # vim: syntax=make