summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-05-28 08:58:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-29 21:07:17 +0100
commitbed11ee92a7ac871909a04f751732dbf02ab7c85 (patch)
tree1500b87e458e5911e0cb78334b1c19d6b0b22fc1 /meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
parentf3515d2d2545cae6b88fe5e86d081f4ef6133bf6 (diff)
downloadpoky-bed11ee92a7ac871909a04f751732dbf02ab7c85.tar.gz
systemd: Fix build with gcc8
(From OE-Core rev: 6a3805f06cd7832d70d5b652ec1be612f5f027e6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch9
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
index b7b1ea0886..98c83620ff 100644
--- a/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
+++ b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
@@ -1,4 +1,4 @@
1From 9820c165a9e559cf851e3beb60fad2571de4ded2 Mon Sep 17 00:00:00 2001 1From 7844e070745611a52e355b73e7890f360dd540d0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Dec 2015 04:09:19 +0000 3Date: Mon, 14 Dec 2015 04:09:19 +0000
4Subject: [PATCH] core/device.c: Change the default device timeout to 240 sec. 4Subject: [PATCH] core/device.c: Change the default device timeout to 240 sec.
@@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
17 17
18diff --git a/src/core/device.c b/src/core/device.c 18diff --git a/src/core/device.c b/src/core/device.c
19index 77601c552..98bf49ba2 100644 19index a43664d3b..4b16a8aec 100644
20--- a/src/core/device.c 20--- a/src/core/device.c
21+++ b/src/core/device.c 21+++ b/src/core/device.c
22@@ -112,7 +112,7 @@ static void device_init(Unit *u) { 22@@ -113,7 +113,7 @@ static void device_init(Unit *u) {
23 * indefinitely for plugged in devices, something which cannot 23 * indefinitely for plugged in devices, something which cannot
24 * happen for the other units since their operations time out 24 * happen for the other units since their operations time out
25 * anyway. */ 25 * anyway. */
@@ -28,6 +28,3 @@ index 77601c552..98bf49ba2 100644
28 28
29 u->ignore_on_isolate = true; 29 u->ignore_on_isolate = true;
30 } 30 }
31--
322.16.1
33