Skip to content
Snippets Groups Projects
Commit 173cf50e authored by Samuli Piippo's avatar Samuli Piippo Committed by Jędrzej Nowacki
Browse files

systemd: patch no longer needed


Change-Id: I49ee9f857992ae0e42394e356138e6cc06591914
Reviewed-by: default avatarGatis Paeglis <gatis.paeglis@qt.io>
parent 4d21fb72
No related branches found
No related tags found
No related merge requests found
From 6a7105e23d8be76094b90d814eab9135e2cc4b8a Mon Sep 17 00:00:00 2001
From: Gatis Paeglis <gatis.paeglis@qt.io>
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
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " \ SRC_URI += " \
file://0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch \
file://usb-rndis.network \ file://usb-rndis.network \
" "
...@@ -42,11 +41,3 @@ do_install_append() { ...@@ -42,11 +41,3 @@ do_install_append() {
install -d ${D}${prefix}/lib/systemd/network/ install -d ${D}${prefix}/lib/systemd/network/
install -m 0644 ${WORKDIR}/usb-rndis.network ${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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment