diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-08-02 18:27:31 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-13 09:27:37 +0100 |
commit | f06f9f3c893db8485bd4e6a76d4fb8cd51b38ec9 (patch) | |
tree | 4c446d468d01ce58e4799b3260d020442a6b7e38 /meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch | |
parent | 42ffbda12430a29f6778d6626e9defd75783f85d (diff) | |
download | poky-f06f9f3c893db8485bd4e6a76d4fb8cd51b38ec9.tar.gz |
systemd: update to 234
The new version fixes gperf 3.1 issues, so the update is included
in this patchset.
Modified patches are all rebases to the new version.
Deleted patches are backports, except 0016-make-test-dir-configurable.patch
which is obsolete in the new version (TEST_DIR define is no longer used anywhere).
--with-testdir is removed from configure for the same reason.
(From OE-Core rev: 34afb46f75d6c356f23f70c5ece96e45594e1546)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.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.patch | 13 |
1 files changed, 7 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 ee2cd6c453..7f1bc447fe 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,7 +1,7 @@ | |||
1 | From a544d6d15f5c418084f322349aafe341128d5fca Mon Sep 17 00:00:00 2001 | 1 | From f1b5a6f717bda6f80a6b5e3e4d50b450f6cc7b09 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 14 Dec 2015 04:09:19 +0000 | 3 | Date: Mon, 14 Dec 2015 04:09:19 +0000 |
4 | Subject: [PATCH 01/19] core/device.c: Change the default device timeout to 240 | 4 | Subject: [PATCH 14/14] core/device.c: Change the default device timeout to 240 |
5 | sec. | 5 | sec. |
6 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
7 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
@@ -11,23 +11,24 @@ Upstream-Status: Inappropriate [Specific case QEMU/AB] | |||
11 | 11 | ||
12 | Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> | 12 | Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> |
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | |||
14 | --- | 15 | --- |
15 | src/core/device.c | 2 +- | 16 | src/core/device.c | 2 +- |
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 18 | ||
18 | diff --git a/src/core/device.c b/src/core/device.c | 19 | diff --git a/src/core/device.c b/src/core/device.c |
19 | index c572a67..f90774e 100644 | 20 | index 77601c552..98bf49ba2 100644 |
20 | --- a/src/core/device.c | 21 | --- a/src/core/device.c |
21 | +++ b/src/core/device.c | 22 | +++ b/src/core/device.c |
22 | @@ -112,7 +112,7 @@ static void device_init(Unit *u) { | 23 | @@ -112,7 +112,7 @@ static void device_init(Unit *u) { |
23 | * indefinitely for plugged in devices, something which cannot | 24 | * indefinitely for plugged in devices, something which cannot |
24 | * happen for the other units since their operations time out | 25 | * happen for the other units since their operations time out |
25 | * anyway. */ | 26 | * anyway. */ |
26 | - u->job_timeout = u->manager->default_timeout_start_usec; | 27 | - u->job_running_timeout = u->manager->default_timeout_start_usec; |
27 | + u->job_timeout = (240 * USEC_PER_SEC); | 28 | + u->job_running_timeout = (240 * USEC_PER_SEC); |
28 | 29 | ||
29 | u->ignore_on_isolate = true; | 30 | u->ignore_on_isolate = true; |
30 | } | 31 | } |
31 | -- | 32 | -- |
32 | 2.10.2 | 33 | 2.13.2 |
33 | 34 | ||