diff options
author | 2015-12-14 05:55:35 +0000 | |
---|---|---|
committer | 2015-12-16 12:12:18 +0000 | |
commit | 54f01ca1174179918828a9b61ebc6c3e62da8e88 (patch) | |
tree | 6f2c6c34b6716962bd12a19cf4c2796f9f17976c /meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch | |
parent | 63bdadccb662fcae52ec9ddb7f6e43b454dd1d1c (diff) | |
download | openembedded-core-contrib-54f01ca1174179918828a9b61ebc6c3e62da8e88.tar.gz |
systemd: Upgrade to 228
Forward port all patches and format them to be git am'able
Drop patches specific to uclibc's missing features which now
are there in uclibc-ng
(From OE-Core rev: fcaa030fa3c6eb0980cc635b92d6819682cf7742)
Signed-off-by: Khem Raj <raj.khem@gmail.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/0004-core-device.c-Change-the-default-device-timeout-to-2.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0004-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/0004-core-device.c-Change-the-default-device-timeout-to-2.patch b/meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch new file mode 100644 index 0000000000..74629fc82a --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch @@ -0,0 +1,33 @@ +From ef867afd27e8fed558e82430759d8d2c7efb6608 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 14 Dec 2015 04:09:19 +0000 +Subject: [PATCH 04/16] core/device.c: Change the default device timeout to 240 + sec. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [Specific case QEMU/AB] + +Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/core/device.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/device.c b/src/core/device.c +index bcd4d11..f41bb54 100644 +--- a/src/core/device.c ++++ b/src/core/device.c +@@ -114,7 +114,7 @@ static void device_init(Unit *u) { + * indefinitely for plugged in devices, something which cannot + * happen for the other units since their operations time out + * anyway. */ +- u->job_timeout = u->manager->default_timeout_start_usec; ++ u->job_timeout = (240 * USEC_PER_SEC); + + u->ignore_on_isolate = true; + } +-- +2.6.4 + |