[oe-commits] [openembedded-core] 01/02: systemd: Test revert of patch removal

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit bf5c2021fb9e2323471dc79a650cb36bd1db95f3
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Sat Oct 20 10:59:40 2018 +0100

    systemd: Test revert of patch removal
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 ....c-Change-the-default-device-timeout-to-2.patch | 35 ++++++++++++++++++++++
 meta/recipes-core/systemd/systemd_239.bb           |  1 +
 2 files changed, 36 insertions(+)

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 0000000..fd7bf3f
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
@@ -0,0 +1,35 @@
+From 2925c0c3b6ce4056622b86c1c61ee14add430790 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen at windriver.com>
+Date: Thu, 28 Jun 2018 10:56:29 +0800
+Subject: [PATCH] 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
+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 at linux.intel.com>
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+Signed-off-by: Chen Qi <Qi.Chen at windriver.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 a2d00a0fb..f26e55ebb 100644
+--- a/src/core/device.c
++++ b/src/core/device.c
+@@ -95,7 +95,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_running_timeout = u->manager->default_timeout_start_usec;
++        u->job_running_timeout = (240 * USEC_PER_SEC);
+ 
+         u->ignore_on_isolate = true;
+ 
+-- 
+2.11.0
+
diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb
index 1b3c248..bdfdaca 100644
--- a/meta/recipes-core/systemd/systemd_239.bb
+++ b/meta/recipes-core/systemd/systemd_239.bb
@@ -30,6 +30,7 @@ SRC_URI += "file://touchscreen.rules \
            file://0001-sd-bus-make-BUS_DEFAULT_TIMEOUT-configurable.patch \
            file://0022-build-sys-Detect-whether-struct-statx-is-defined-in-.patch \
            file://0023-resolvconf-fixes-for-the-compatibility-interface.patch \
+           file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch \
            "
 
 # patches made for musl are only applied on TCLIBC is musl

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.