summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2018-10-17 12:43:23 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-21 21:30:35 +0100
commit28c2f0dfe3ae06d87772b2a88fcace5a03e09143 (patch)
tree83097d1031d4c24034045a6bdc9bd9a042b70576 /meta/recipes-core/systemd/systemd
parent5293bee5f77f49a4318517d77103c818a36fafa0 (diff)
downloadpoky-28c2f0dfe3ae06d87772b2a88fcace5a03e09143.tar.gz
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 <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch35
1 files changed, 0 insertions, 35 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
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 @@
1From 2925c0c3b6ce4056622b86c1c61ee14add430790 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Thu, 28 Jun 2018 10:56:29 +0800
4Subject: [PATCH] core/device.c: Change the default device timeout to 240 sec.
5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8
6 Content-Transfer-Encoding: 8bit
7MIME-Version: 1.0
8Content-Type: text/plain; charset=UTF-8
9Content-Transfer-Encoding: 8bit
10
11Upstream-Status: Inappropriate [Specific case QEMU/AB]
12
13Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
16---
17 src/core/device.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/src/core/device.c b/src/core/device.c
21index a2d00a0fb..f26e55ebb 100644
22--- a/src/core/device.c
23+++ b/src/core/device.c
24@@ -95,7 +95,7 @@ static void device_init(Unit *u) {
25 * indefinitely for plugged in devices, something which cannot
26 * happen for the other units since their operations time out
27 * anyway. */
28- u->job_running_timeout = u->manager->default_timeout_start_usec;
29+ u->job_running_timeout = (240 * USEC_PER_SEC);
30
31 u->ignore_on_isolate = true;
32
33--
342.11.0
35