[Buildroot] [PATCH v2] package/busybox: Fix hwclock for glibc 2.31+
Klaus Heinrich Kiwi
klaus at linux.vnet.ibm.com
Thu Nov 12 22:50:16 UTC 2020
Pick the below patch from upstream, in order to fix
'settimeofday: Invalid argument' introduced by using glibc v2.31+.
(busybox hasn't tagged a new version since).
See https://bugs.busybox.net/show_bug.cgi?id=12756 for more info.
commit 1a5d6fcbb5e606ab4acdf22afa26361a25f1d43b
Author: Eddie James <eajames at linux.ibm.com>
hwclock: Fix settimeofday for glibc v2.31+
Signed-off-by: Klaus Heinrich Kiwi <klaus at linux.vnet.ibm.com>
---
Changes v1 -> V2:
- format-patch from the commit itself, instead of applying staged
patches on top of 1_32_0
---
...ock-Fix-settimeofday-for-glibc-v2.31.patch | 58 +++++++++++++++++++
1 file changed, 58 insertions(+)
create mode 100644 package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch
diff --git a/package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch b/package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch
new file mode 100644
index 0000000000..486d3dead3
--- /dev/null
+++ b/package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch
@@ -0,0 +1,58 @@
+From 1a5d6fcbb5e606ab4acdf22afa26361a25f1d43b Mon Sep 17 00:00:00 2001
+From: Eddie James <eajames at linux.ibm.com>
+Date: Mon, 10 Aug 2020 09:59:02 -0500
+Subject: [PATCH] hwclock: Fix settimeofday for glibc v2.31+
+
+The glibc implementation changed for settimeofday, resulting in "invalid
+argument" error when attempting to set both timezone and time with a single
+call. Fix this by calling settimeofday twice
+
+Signed-off-by: Eddie James <eajames at linux.ibm.com>
+Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
+---
+ util-linux/hwclock.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
+index 357906cca..e85bca2b2 100644
+--- a/util-linux/hwclock.c
++++ b/util-linux/hwclock.c
+@@ -121,16 +121,20 @@ static void to_sys_clock(const char **pp_rtcname, int utc)
+ struct timeval tv;
+ struct timezone tz;
+
+- tz.tz_minuteswest = timezone/60;
++ tz.tz_minuteswest = timezone / 60;
+ /* ^^^ used to also subtract 60*daylight, but it's wrong:
+ * daylight!=0 means "this timezone has some DST
+ * during the year", not "DST is in effect now".
+ */
+ tz.tz_dsttime = 0;
+
++ /* glibc v2.31+ returns an error if both args are non-NULL */
++ if (settimeofday(NULL, &tz))
++ bb_simple_perror_msg_and_die("settimeofday");
++
+ tv.tv_sec = read_rtc(pp_rtcname, NULL, utc);
+ tv.tv_usec = 0;
+- if (settimeofday(&tv, &tz))
++ if (settimeofday(&tv, NULL))
+ bb_simple_perror_msg_and_die("settimeofday");
+ }
+
+@@ -282,7 +286,11 @@ static void set_system_clock_timezone(int utc)
+ gettimeofday(&tv, NULL);
+ if (!utc)
+ tv.tv_sec += tz.tz_minuteswest * 60;
+- if (settimeofday(&tv, &tz))
++
++ /* glibc v2.31+ returns an error if both args are non-NULL */
++ if (settimeofday(NULL, &tz))
++ bb_simple_perror_msg_and_die("settimeofday");
++ if (settimeofday(&tv, NULL))
+ bb_simple_perror_msg_and_die("settimeofday");
+ }
+
+--
+2.17.1
+
--
2.17.1
More information about the buildroot
mailing list