summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-02-27 00:05:57 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-28 23:11:29 +0000
commitcfd64145801580898a179f1d235512d4b5917379 (patch)
tree139b3ad2a47e6d58a065debcf21fa283219ffeb8
parent82b79df0796fbf414c7f824f61a3f1dbea4cb673 (diff)
downloadpoky-cfd64145801580898a179f1d235512d4b5917379.tar.gz
systemd: Drop local time64 patch in favour of upstreamed patches
https://github.com/systemd/systemd/commit/9e7c8f64cfda101496f56f5546097221e8ad5d6a https://github.com/systemd/systemd/commit/601f91bec5646a9c6fbd4f1ec5f1b4ae28d3a770 Fixed this issue upstream and they are present in 244 release (From OE-Core rev: d0f00610edf4e4f2d4e49213b160bafe329aaa87) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch31
-rw-r--r--meta/recipes-core/systemd/systemd_244.3.bb3
2 files changed, 1 insertions, 33 deletions
diff --git a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch
deleted file mode 100644
index 33c575871c..0000000000
--- a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 3cc30186f9d9adb565dc29f2d4e68889974676ae Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 16 Dec 2019 12:49:07 -0800
4Subject: [PATCH] Use INT_MAX instead of TIME_T_MAX for timerfd_settime timeout
5
6kernel prior to 64bit time_t support might not entertain such large
7timeout therefore reduce it to INT_MAX which would set timer expiration
8event after 68 years of uptime, should be good for all practical
9purposes
10
11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Upstream-Status: Pending
14
15---
16 src/basic/time-util.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/basic/time-util.c b/src/basic/time-util.c
20index d7ef30d2fe52..4d3219f114b5 100644
21--- a/src/basic/time-util.c
22+++ b/src/basic/time-util.c
23@@ -1487,7 +1487,7 @@ int time_change_fd(void) {
24
25 /* We only care for the cancellation event, hence we set the timeout to the latest possible value. */
26 static const struct itimerspec its = {
27- .it_value.tv_sec = TIME_T_MAX,
28+ .it_value.tv_sec = INT_MAX,
29 };
30
31 _cleanup_close_ int fd;
diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb
index e7d2997963..dfb7ad59c0 100644
--- a/meta/recipes-core/systemd/systemd_244.3.bb
+++ b/meta/recipes-core/systemd/systemd_244.3.bb
@@ -17,9 +17,9 @@ REQUIRED_DISTRO_FEATURES = "systemd"
17SRC_URI += "file://touchscreen.rules \ 17SRC_URI += "file://touchscreen.rules \
18 file://00-create-volatile.conf \ 18 file://00-create-volatile.conf \
19 file://init \ 19 file://init \
20 file://99-default.preset \
20 file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ 21 file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
21 file://0003-implment-systemd-sysv-install-for-OE.patch \ 22 file://0003-implment-systemd-sysv-install-for-OE.patch \
22 file://99-default.preset \
23 " 23 "
24 24
25# patches needed by musl 25# patches needed by musl
@@ -42,7 +42,6 @@ SRC_URI_MUSL = "\
42 file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ 42 file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \
43 file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ 43 file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \
44 file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ 44 file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \
45 file://0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch \
46 file://0024-test-json.c-define-M_PIl.patch \ 45 file://0024-test-json.c-define-M_PIl.patch \
47 file://0001-do-not-disable-buffer-in-writing-files.patch \ 46 file://0001-do-not-disable-buffer-in-writing-files.patch \
48 file://0002-src-login-brightness.c-include-sys-wait.h.patch \ 47 file://0002-src-login-brightness.c-include-sys-wait.h.patch \