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) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="systemd" PKG_NAME="systemd"
PKG_VERSION="254.7" PKG_VERSION="255"
PKG_SHA256="9d7b4b21d2db3b16286b9ec6657ba86bd797388c532bdc63862826f6d39fe8cb" PKG_SHA256="a3eb766ee96eb9f4cc25c2a6c933f3299e1b7ae22e72507dade0a5c86d92534f"
PKG_LICENSE="LGPL2.1+" PKG_LICENSE="LGPL2.1+"
PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
PKG_URL="https://github.com/systemd/systemd-stable/archive/v${PKG_VERSION}.tar.gz" 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 \ -Ddefault-hierarchy=unified \
-Dtty-gid=5 \ -Dtty-gid=5 \
-Dtests=false \ -Dtests=false \
-Dseccomp=false \ -Dseccomp=disabled \
-Dselinux=false \ -Dselinux=disabled \
-Dapparmor=false \ -Dapparmor=disabled \
-Dpolkit=false \ -Dpolkit=disabled \
-Dacl=false \ -Dacl=disabled \
-Daudit=false \ -Daudit=disabled \
-Dblkid=true \ -Dblkid=enabled \
-Dfdisk=false \ -Dfdisk=disabled \
-Dkmod=true \ -Dkmod=enabled \
-Dpam=false \ -Dpam=disabled \
-Dpwquality=false \ -Dpwquality=disabled \
-Dmicrohttpd=false \ -Dmicrohttpd=disabled \
-Dlibcryptsetup=false \ -Dlibcryptsetup=disabled \
-Dlibcurl=false \ -Dlibcurl=disabled \
-Dlibidn=false \ -Dlibidn=disabled \
-Dlibidn2=true \ -Dlibidn2=enabled \
-Dlibiptc=false \ -Dlibiptc=disabled \
-Dqrencode=false \ -Dqrencode=disabled \
-Dgcrypt=false \ -Dgcrypt=disabled \
-Dgnutls=false \ -Dgnutls=disabled \
-Dopenssl=false \ -Dopenssl=disabled \
-Dp11kit=false \ -Dp11kit=disabled \
-Delfutils=false \ -Delfutils=disabled \
-Dzlib=false \ -Dzlib=disabled \
-Dbzip2=false \ -Dbzip2=disabled \
-Dxz=false \ -Dxz=disabled \
-Dlz4=false \ -Dlz4=disabled \
-Dzstd=false \ -Dzstd=disabled \
-Dxkbcommon=false \ -Dxkbcommon=disabled \
-Dpcre2=false \ -Dpcre2=disabled \
-Dglib=false \ -Dglib=disabled \
-Ddbus=false \ -Ddbus=disabled \
-Ddefault-dnssec=no \ -Ddefault-dnssec=no \
-Dimportd=false \ -Dimportd=disabled \
-Dremote=false \ -Dremote=disabled \
-Dutmp=true \ -Dutmp=true \
-Dhibernate=false \ -Dhibernate=false \
-Denvironment-d=false \ -Denvironment-d=false \
-Dbinfmt=false \ -Dbinfmt=false \
-Drepart=false \ -Drepart=disabled \
-Dcoredump=false \ -Dcoredump=false \
-Dresolve=false \ -Dresolve=false \
-Dlogind=true \ -Dlogind=true \
@ -66,7 +66,7 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
-Dmachined=false \ -Dmachined=false \
-Dportabled=false \ -Dportabled=false \
-Duserdb=false \ -Duserdb=false \
-Dhomed=false \ -Dhomed=disabled \
-Dnetworkd=false \ -Dnetworkd=false \
-Dtimedated=false \ -Dtimedated=false \
-Dtimesyncd=true \ -Dtimesyncd=true \
@ -86,11 +86,11 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
-Dgshadow=false \ -Dgshadow=false \
-Didn=false \ -Didn=false \
-Dnss-myhostname=false \ -Dnss-myhostname=false \
-Dnss-mymachines=false \ -Dnss-mymachines=disabled \
-Dnss-resolve=false \ -Dnss-resolve=disabled \
-Dnss-systemd=false \ -Dnss-systemd=false \
-Dman=false \ -Dman=disabled \
-Dhtml=false \ -Dhtml=disabled \
-Dlink-udev-shared=true \ -Dlink-udev-shared=true \
-Dlink-systemctl-shared=true \ -Dlink-systemctl-shared=true \
-Dlink-networkd-shared=false \ -Dlink-networkd-shared=false \

View File

@ -8,10 +8,10 @@ diff --git a/meson.build b/meson.build
index dbbddb68e2..4592cd1094 100644 index dbbddb68e2..4592cd1094 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -266,7 +266,7 @@ @@ -253,7 +253,7 @@
conf.set_quoted('SYSTEMD_UPDATE_HELPER_PATH', rootlibexecdir / 'systemd-update-helper') conf.set_quoted('SYSTEMD_UPDATE_HELPER_PATH', libexecdir / 'systemd-update-helper')
conf.set_quoted('SYSTEMD_USERWORK_PATH', rootlibexecdir / 'systemd-userwork') conf.set_quoted('SYSTEMD_USERWORK_PATH', libexecdir / 'systemd-userwork')
conf.set_quoted('SYSTEMD_VERITYSETUP_PATH', rootlibexecdir / 'systemd-veritysetup') 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', pkgsysconfdir / 'system')
+conf.set_quoted('SYSTEM_CONFIG_UNIT_DIR', '/storage/.config/system.d') +conf.set_quoted('SYSTEM_CONFIG_UNIT_DIR', '/storage/.config/system.d')
conf.set_quoted('SYSTEM_DATA_UNIT_DIR', systemunitdir) conf.set_quoted('SYSTEM_DATA_UNIT_DIR', systemunitdir)