From 8fca16ecfc4d0f8c22999bf1bcdb8037b8dc1b8c Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 7 Nov 2023 00:54:14 +0000 Subject: [PATCH 1/2] systemd: update to 255 Release notes: - https://github.com/systemd/systemd/releases --- packages/sysutils/systemd/package.mk | 4 ++-- ...e-etc-systemd-system-to-storage-.config-system.d.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index 67fd8f648c..f182ff5a36 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="systemd" -PKG_VERSION="254.7" -PKG_SHA256="9d7b4b21d2db3b16286b9ec6657ba86bd797388c532bdc63862826f6d39fe8cb" +PKG_VERSION="255" +PKG_SHA256="a3eb766ee96eb9f4cc25c2a6c933f3299e1b7ae22e72507dade0a5c86d92534f" PKG_LICENSE="LGPL2.1+" PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" PKG_URL="https://github.com/systemd/systemd-stable/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/sysutils/systemd/patches/systemd-0001-move-etc-systemd-system-to-storage-.config-system.d.patch b/packages/sysutils/systemd/patches/systemd-0001-move-etc-systemd-system-to-storage-.config-system.d.patch index 5cbe7a044e..cd0dda1517 100644 --- a/packages/sysutils/systemd/patches/systemd-0001-move-etc-systemd-system-to-storage-.config-system.d.patch +++ b/packages/sysutils/systemd/patches/systemd-0001-move-etc-systemd-system-to-storage-.config-system.d.patch @@ -8,10 +8,10 @@ diff --git a/meson.build b/meson.build index dbbddb68e2..4592cd1094 100644 --- a/meson.build +++ b/meson.build -@@ -266,7 +266,7 @@ - conf.set_quoted('SYSTEMD_UPDATE_HELPER_PATH', rootlibexecdir / 'systemd-update-helper') - conf.set_quoted('SYSTEMD_USERWORK_PATH', rootlibexecdir / 'systemd-userwork') - conf.set_quoted('SYSTEMD_VERITYSETUP_PATH', rootlibexecdir / 'systemd-veritysetup') +@@ -253,7 +253,7 @@ + conf.set_quoted('SYSTEMD_UPDATE_HELPER_PATH', libexecdir / 'systemd-update-helper') + conf.set_quoted('SYSTEMD_USERWORK_PATH', libexecdir / 'systemd-userwork') + conf.set_quoted('SYSTEMD_VERITYSETUP_PATH', libexecdir / 'systemd-veritysetup') -conf.set_quoted('SYSTEM_CONFIG_UNIT_DIR', pkgsysconfdir / 'system') +conf.set_quoted('SYSTEM_CONFIG_UNIT_DIR', '/storage/.config/system.d') conf.set_quoted('SYSTEM_DATA_UNIT_DIR', systemunitdir) From a7f20da01a89fef4e7da34c5551656d760c85b74 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 28 Nov 2023 11:15:05 +0000 Subject: [PATCH 2/2] systemd: update boolean to string in config --- packages/sysutils/systemd/package.mk | 80 ++++++++++++++-------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index f182ff5a36..10c00bd319 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -18,46 +18,46 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \ -Ddefault-hierarchy=unified \ -Dtty-gid=5 \ -Dtests=false \ - -Dseccomp=false \ - -Dselinux=false \ - -Dapparmor=false \ - -Dpolkit=false \ - -Dacl=false \ - -Daudit=false \ - -Dblkid=true \ - -Dfdisk=false \ - -Dkmod=true \ - -Dpam=false \ - -Dpwquality=false \ - -Dmicrohttpd=false \ - -Dlibcryptsetup=false \ - -Dlibcurl=false \ - -Dlibidn=false \ - -Dlibidn2=true \ - -Dlibiptc=false \ - -Dqrencode=false \ - -Dgcrypt=false \ - -Dgnutls=false \ - -Dopenssl=false \ - -Dp11kit=false \ - -Delfutils=false \ - -Dzlib=false \ - -Dbzip2=false \ - -Dxz=false \ - -Dlz4=false \ - -Dzstd=false \ - -Dxkbcommon=false \ - -Dpcre2=false \ - -Dglib=false \ - -Ddbus=false \ + -Dseccomp=disabled \ + -Dselinux=disabled \ + -Dapparmor=disabled \ + -Dpolkit=disabled \ + -Dacl=disabled \ + -Daudit=disabled \ + -Dblkid=enabled \ + -Dfdisk=disabled \ + -Dkmod=enabled \ + -Dpam=disabled \ + -Dpwquality=disabled \ + -Dmicrohttpd=disabled \ + -Dlibcryptsetup=disabled \ + -Dlibcurl=disabled \ + -Dlibidn=disabled \ + -Dlibidn2=enabled \ + -Dlibiptc=disabled \ + -Dqrencode=disabled \ + -Dgcrypt=disabled \ + -Dgnutls=disabled \ + -Dopenssl=disabled \ + -Dp11kit=disabled \ + -Delfutils=disabled \ + -Dzlib=disabled \ + -Dbzip2=disabled \ + -Dxz=disabled \ + -Dlz4=disabled \ + -Dzstd=disabled \ + -Dxkbcommon=disabled \ + -Dpcre2=disabled \ + -Dglib=disabled \ + -Ddbus=disabled \ -Ddefault-dnssec=no \ - -Dimportd=false \ - -Dremote=false \ + -Dimportd=disabled \ + -Dremote=disabled \ -Dutmp=true \ -Dhibernate=false \ -Denvironment-d=false \ -Dbinfmt=false \ - -Drepart=false \ + -Drepart=disabled \ -Dcoredump=false \ -Dresolve=false \ -Dlogind=true \ @@ -66,7 +66,7 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \ -Dmachined=false \ -Dportabled=false \ -Duserdb=false \ - -Dhomed=false \ + -Dhomed=disabled \ -Dnetworkd=false \ -Dtimedated=false \ -Dtimesyncd=true \ @@ -86,11 +86,11 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \ -Dgshadow=false \ -Didn=false \ -Dnss-myhostname=false \ - -Dnss-mymachines=false \ - -Dnss-resolve=false \ + -Dnss-mymachines=disabled \ + -Dnss-resolve=disabled \ -Dnss-systemd=false \ - -Dman=false \ - -Dhtml=false \ + -Dman=disabled \ + -Dhtml=disabled \ -Dlink-udev-shared=true \ -Dlink-systemctl-shared=true \ -Dlink-networkd-shared=false \