From 28c2f0dfe3ae06d87772b2a88fcace5a03e09143 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 17 Oct 2018 12:43:23 -0400 Subject: systemd: Remove items that made this machine (qemu) specific Create a new systemd-conf recipe to contain the specific system/machine configuration items. This new package is now machine specific. Without doing this trying to create a single system with multiple BSPs, one of which was qemu based, would result in the systemd -and- everything that dependend upon systemd to have their hash changed. The hash changing means lots of rebuilds, but worse if it's a package based system each different machine ends with a new PR value and a newly generated package. (From OE-Core rev: d3395418758ed414eee3e95e13d2d8bc5dca88cc) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- ....c-Change-the-default-device-timeout-to-2.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch (limited to 'meta/recipes-core/systemd/systemd') 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 deleted file mode 100644 index fd7bf3fcf6..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2925c0c3b6ce4056622b86c1c61ee14add430790 Mon Sep 17 00:00:00 2001 -From: Chen Qi -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 -Signed-off-by: Khem Raj -Signed-off-by: Chen Qi ---- - 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 - -- cgit v1.2.3-54-g00ecf