diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-02-22 21:36:52 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-26 17:16:24 +0000 |
commit | 64ab17b707dc431aaed880d6d8615971243f46f8 (patch) | |
tree | 8eaf41c6096122e95c83e0ee42f0a346ca1455c1 /meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch | |
parent | 44248af1735e95dc636619200c25eb7250e77d95 (diff) | |
download | poky-64ab17b707dc431aaed880d6d8615971243f46f8.tar.gz |
systemd: Upgrade to 229
Forward port all existing patches and arrange them such such
uclibc-only and qemu-only patches appear first
Add new patches to fix build on uclibc ( 0019-0022 )
Convert the lnr sed operation into a static patch
Use PACKAGECONFIG setting to disable features for muls and uclibc
instead of modifying EXTRA_OECONF manually
Drop compat from PACKAGECONFIG, this options has been removed
from systemd
Tested/booted sato iamge on all qemus and qemux86-64 on uclibc
(From OE-Core rev: 50743301bd8c0c4817d039d08c9567d15243a74d)
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.patch | 33 |
1 files changed, 33 insertions, 0 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 new file mode 100644 index 0000000000..f7ef7a3219 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 3bc4552117879f57522b5972b724729ca993f1ea Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 14 Dec 2015 04:09:19 +0000 | ||
4 | Subject: [PATCH 01/36] core/device.c: Change the default device timeout to 240 | ||
5 | sec. | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | Upstream-Status: Inappropriate [Specific case QEMU/AB] | ||
11 | |||
12 | Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | src/core/device.c | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/core/device.c b/src/core/device.c | ||
19 | index d201dc5..340d62a 100644 | ||
20 | --- a/src/core/device.c | ||
21 | +++ b/src/core/device.c | ||
22 | @@ -112,7 +112,7 @@ static void device_init(Unit *u) { | ||
23 | * indefinitely for plugged in devices, something which cannot | ||
24 | * happen for the other units since their operations time out | ||
25 | * anyway. */ | ||
26 | - u->job_timeout = u->manager->default_timeout_start_usec; | ||
27 | + u->job_timeout = (240 * USEC_PER_SEC); | ||
28 | |||
29 | u->ignore_on_isolate = true; | ||
30 | } | ||
31 | -- | ||
32 | 1.8.3.1 | ||
33 | |||