From c31015f684b83ea30da557551ac512da50ee87f0 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 29 Nov 2019 20:16:35 +0100 Subject: [PATCH] systemd: update to v244 dropped mountinfo backport patch as it's in upstream version. Signed-off-by: Matthias Reichl --- packages/sysutils/systemd/package.mk | 4 +- ...pdate-exec-deps-on-mountinfo-changes.patch | 84 ------------------- 2 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 packages/sysutils/systemd/patches/systemd-0900-backport-do-not-update-exec-deps-on-mountinfo-changes.patch diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index 2ce026fa3e..2c62696d83 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="243" -PKG_SHA256="0611843c2407f8b125b1b7cb93533bdebd4ccf91c99dffa64ec61556a258c7d1" +PKG_VERSION="244" +PKG_SHA256="2207ceece44108a04bdd5459aa74413d765a829848109da6f5f836c25aa393aa" 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-0900-backport-do-not-update-exec-deps-on-mountinfo-changes.patch b/packages/sysutils/systemd/patches/systemd-0900-backport-do-not-update-exec-deps-on-mountinfo-changes.patch deleted file mode 100644 index 0f422c9a8f..0000000000 --- a/packages/sysutils/systemd/patches/systemd-0900-backport-do-not-update-exec-deps-on-mountinfo-changes.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 9074b57fd5a5c8ae20b15b59ed9abe9a7f0147b0 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Fri, 15 Nov 2019 14:00:54 +0100 -Subject: [PATCH] mount: do not update exec deps on mountinfo changes - -Fixes: #13978 ---- - src/core/mount.c | 42 ++++++++++++++++++++++++++++-------------- - 1 file changed, 28 insertions(+), 14 deletions(-) - -diff --git a/src/core/mount.c b/src/core/mount.c -index 1d1d2683da4..dfed691c43f 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -550,6 +550,32 @@ static int mount_verify(Mount *m) { - return 0; - } - -+static int mount_add_non_exec_dependencies(Mount *m) { -+ int r; -+ assert(m); -+ -+ /* Adds in all dependencies directly responsible for ordering the mount, as opposed to dependencies -+ * resulting from the ExecContext and such. */ -+ -+ r = mount_add_device_dependencies(m); -+ if (r < 0) -+ return r; -+ -+ r = mount_add_mount_dependencies(m); -+ if (r < 0) -+ return r; -+ -+ r = mount_add_quota_dependencies(m); -+ if (r < 0) -+ return r; -+ -+ r = mount_add_default_dependencies(m); -+ if (r < 0) -+ return r; -+ -+ return 0; -+} -+ - static int mount_add_extras(Mount *m) { - Unit *u = UNIT(m); - int r; -@@ -577,18 +603,6 @@ static int mount_add_extras(Mount *m) { - return r; - } - -- r = mount_add_device_dependencies(m); -- if (r < 0) -- return r; -- -- r = mount_add_mount_dependencies(m); -- if (r < 0) -- return r; -- -- r = mount_add_quota_dependencies(m); -- if (r < 0) -- return r; -- - r = unit_patch_contexts(u); - if (r < 0) - return r; -@@ -601,7 +615,7 @@ static int mount_add_extras(Mount *m) { - if (r < 0) - return r; - -- r = mount_add_default_dependencies(m); -+ r = mount_add_non_exec_dependencies(m); - if (r < 0) - return r; - -@@ -1574,7 +1588,7 @@ static int mount_setup_existing_unit( - - unit_remove_dependencies(u, UNIT_DEPENDENCY_MOUNTINFO_IMPLICIT); - -- r = mount_add_extras(MOUNT(u)); -+ r = mount_add_non_exec_dependencies(MOUNT(u)); - if (r < 0) - return r; - }