Merge pull request #8399 from heitbaum/systemd

systemd update to v255
This commit is contained in:
Christian Hewitt 2023-12-14 09:01:53 +04:00 committed by GitHub
commit 9a41cfc719
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 46 deletions

View File

@ -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"
@ -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 \

View File

@ -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)