From 8ccfbe62942318da86824b3093572df6ee73ed9e Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 28 Sep 2020 23:48:18 +0200 Subject: [PATCH] systemd: update to v246 Signed-off-by: Matthias Reichl --- packages/sysutils/systemd/package.mk | 4 ++-- ...temd-system-to-storage-.config-system.d.patch | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index dbf9360264..4125352995 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="245" -PKG_SHA256="f34f1dc52b2dc60563c2deb6db86d78f6a97bceb29aa0511436844b2fc618040" +PKG_VERSION="246" +PKG_SHA256="4268bd88037806c61c5cd1c78d869f7f20bf7e7368c63916d47b5d1c3411bd6f" PKG_LICENSE="LGPL2.1+" PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" PKG_URL="https://github.com/systemd/systemd/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 de8732f376..c2827cc4d6 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 @@ -1,19 +1,19 @@ -commit abce2c21148f981034acf143a3c12e5919949198 -Author: Lukas Rusak -Date: Mon Oct 9 15:26:58 2017 -0700 +commit 43aba5ffffc6d35ed97db035c5818c76652b06de +Author: Matthias Reichl +Date: Mon Sep 28 23:55:13 2020 +0200 move /etc/systemd/system to /storage/.config/system.d diff --git a/meson.build b/meson.build -index f7a610a..b1144a6 100644 +index dbbddb68e2..4592cd1094 100644 --- a/meson.build +++ b/meson.build -@@ -146,7 +146,7 @@ if pamconfdir == '' - endif +@@ -205,7 +205,7 @@ memory_accounting_default = get_option('memory-accounting-default') + status_unit_format_default = get_option('status-unit-format-default') conf.set_quoted('PKGSYSCONFDIR', pkgsysconfdir) --conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH', join_paths(pkgsysconfdir, 'system')) -+conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH', '/storage/.config/system.d') +-conf.set_quoted('SYSTEM_CONFIG_UNIT_DIR', join_paths(pkgsysconfdir, 'system')) ++conf.set_quoted('SYSTEM_CONFIG_UNIT_DIR', '/storage/.config/system.d') conf.set_quoted('SYSTEM_DATA_UNIT_PATH', systemunitdir) conf.set_quoted('SYSTEM_SYSVINIT_PATH', sysvinit_path) conf.set_quoted('SYSTEM_SYSVRCND_PATH', sysvrcnd_path)