From 173cf50e88d53f9cf81c0ac5f2f186834ca3b81f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 30 Sep 2016 13:19:46 +0300 Subject: systemd: patch no longer needed Change-Id: I49ee9f857992ae0e42394e356138e6cc06591914 Reviewed-by: Gatis Paeglis --- ...-mount-add-dependencies-to-dynamically-mo.patch | 27 ---------------------- recipes/systemd/systemd_%.bbappend | 9 -------- 2 files changed, 36 deletions(-) delete mode 100644 recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch diff --git a/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch b/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch deleted file mode 100644 index ed58b50..0000000 --- a/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6a7105e23d8be76094b90d814eab9135e2cc4b8a Mon Sep 17 00:00:00 2001 -From: Gatis Paeglis -Date: Tue, 21 Jun 2016 15:26:47 +0200 -Subject: [PATCH] Revert "core/mount: add dependencies to dynamically mounted - mounts too" - -This reverts commit 06e97888883e2cc12eb6514e80c7f0014295f59b. ---- - src/core/mount.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/mount.c b/src/core/mount.c -index fda4d65..3944232 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -337,7 +337,7 @@ static int mount_add_device_links(Mount *m) { - - assert(m); - -- p = get_mount_parameters(m); -+ p = get_mount_parameters_fragment(m); - if (!p) - return 0; - --- -2.7.4 - diff --git a/recipes/systemd/systemd_%.bbappend b/recipes/systemd/systemd_%.bbappend index 4dce1b2..1ba27fe 100644 --- a/recipes/systemd/systemd_%.bbappend +++ b/recipes/systemd/systemd_%.bbappend @@ -29,7 +29,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ - file://0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch \ file://usb-rndis.network \ " @@ -42,11 +41,3 @@ do_install_append() { install -d ${D}${prefix}/lib/systemd/network/ install -m 0644 ${WORKDIR}/usb-rndis.network ${D}${prefix}/lib/systemd/network/ } - -do_verify_patch_required() { - if [ -n "$(cat ${S}/NEWS | grep "CHANGES WITH 229")" ]; then - bbwarn "systemd: The 0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch patch is not required anymore." - fi -} - -addtask do_verify_patch_required after do_fetch before do_configure -- cgit v1.2.3-54-g00ecf