Skip to contentSkip to conversation

package/busybox: fix build with glibc 2.31 and musl-1.2.0

PATCH New unixmania at gmail.com 2 participants 4 messages Mar 22, 2020

lore
Share & tools
lore
#0 lore raw

v6 cover package/busybox: fix build with glibc 2.31 and musl-1.2.0

From: Carlos Santos <[email protected]>

Current release of busybox 1_31_1 is failing to build with glibc-2.31 due to removal of stime() from glibc. It also fails to build with musl 1.2.0 due to the direct use of __NR_clock_gettime.

Add five patches applied upstream to fix these problems.

Cc Romain Naour <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Yann E. MORIN. <[email protected]>

Carlos Santos (2):
package/busybox: fix build with musl 1.2.0
package/busybox: fix build with glibc 2.31

 ...-Use-64-prefix-syscall-if-we-have-to.patch |  61 ++++++++
 ...-Use-64-prefix-syscall-if-we-have-to.patch |  50 +++++++
 ...-Use-64-prefix-syscall-if-we-have-to.patch |  50 +++++++
 ...rappers-around-clock_gettime-closes-.patch | 134 ++++++++++++++++++
 .../0007-Remove-stime-function-calls.patch    |  97 +++++++++++++
 5 files changed, 392 insertions(+)
 create mode 100644 package/busybox/0003-date-Use-64-prefix-syscall-if-we-have-to.patch
 create mode 100644 package/busybox/0004-time-Use-64-prefix-syscall-if-we-have-to.patch
 create mode 100644 package/busybox/0005-runsv-Use-64-prefix-syscall-if-we-have-to.patch
 create mode 100644 package/busybox/0006-Remove-syscall-wrappers-around-clock_gettime-closes-.patch
 create mode 100644 package/busybox/0007-Remove-stime-function-calls.patch
Signature · 1 line
2.18.2
#1 lore raw

PATCH v6 1/2 package/busybox: fix build with musl 1.2.0

From: Carlos Santos <[email protected]>

Busybox 1.31.1 fails to build with musl 1.2.0 due to the direct use of __NR_clock_gettime. Pull four patches already applied upstream to fix the problem.

The patches were rebased to version 1.31.1 to minimize the change, since the original ones depended on a previous commit which is not worthwhile to pick.

Fixes:
http://autobuild.buildroot.net/results/f45f91aea6deee6699eabdfa618ac44873b8da51/

Cc Romain Naour <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Yann E. MORIN. <[email protected]>
Cc arc-buildroot at synopsys.com

---
Supersedes: https://patchwork.ozlabs.org/patch/1259554/
---
Changes v6:
- Use 5 separate patches from upstream and split the Buildroot fix into two, one for the musl compatibility and other for the glibc, as suggested by Yann E. MORIN..
Changes v5:
- Drop the first patch, squash the other ones and rebase on v1.31.1, as suggested by Romain Naour
Changes v4:
- Rabase on the master branch
- Add SOB lines to patches

---
 ...-Use-64-prefix-syscall-if-we-have-to.patch |  61 ++++++++
 ...-Use-64-prefix-syscall-if-we-have-to.patch |  50 +++++++
 ...-Use-64-prefix-syscall-if-we-have-to.patch |  50 +++++++
 ...rappers-around-clock_gettime-closes-.patch | 134 ++++++++++++++++++
 4 files changed, 295 insertions(+)
 create mode 100644 package/busybox/0003-date-Use-64-prefix-syscall-if-we-have-to.patch
 create mode 100644 package/busybox/0004-time-Use-64-prefix-syscall-if-we-have-to.patch
 create mode 100644 package/busybox/0005-runsv-Use-64-prefix-syscall-if-we-have-to.patch
 create mode 100644 package/busybox/0006-Remove-syscall-wrappers-around-clock_gettime-closes-.patch
package/busybox/0003-date-Use-64-prefix-syscall-if-we-have-to.patch new file +61 -0
new file mode 100644
index 0000000000..2b89584f00
@@ -0,0 +1,61 @@
+From 29ba834ed7d968de0460f7fd87156d43d8120d8f Mon Sep 17 00:00:00 2001
+From: Alistair Francis <[email protected]>
+Date: Wed, 18 Sep 2019 09:28:49 -0700
+Subject: [PATCH] date: Use 64 prefix syscall if we have to
+
+Some 32-bit architectures no longer have the 32-bit time_t syscalls.
+Instead they have suffixed syscalls that returns a 64-bit time_t. If
+the architecture doesn't have the non-suffixed syscall and is using a
+64-bit time_t let's use the suffixed syscall instead.
+
+This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel
+headers.
+
+If an architecture only supports the suffixed syscalls, but is still
+using a 32-bit time_t fall back to the libc call.
+
+Signed-off-by: Alistair Francis <[email protected]>
+Signed-off-by: Denys Vlasenko <[email protected]>
+
+(cherry picked from commit b7b7452f292f03eefafa6fd1da9bcfc933dee15a)
+
+Signed-off-by: Carlos Santos <[email protected]>
+---
+ coreutils/date.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/coreutils/date.c b/coreutils/date.c
+index 3414d38ae..1e0a675ca 100644
+--- a/coreutils/date.c
++++ b/coreutils/date.c
+@@ -36,7 +36,7 @@
+ //config:# defaults to "no": stat's nanosecond field is a bit non-portable
+ //config:config FEATURE_DATE_NANO
+ //config:	bool "Support %[num]N nanosecond format specifier"
+-//config:	default n  # syscall(__NR_clock_gettime)
++//config:	default n  # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64)
+ //config:	depends on DATE
+ //config:	select PLATFORM_LINUX
+ //config:	help
+@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, char **argv)
+ 		 */
+ #endif
+ 	} else {
+-#if ENABLE_FEATURE_DATE_NANO
++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime)
+ 		/* libc has incredibly messy way of doing this,
+ 		 * typically requiring -lrt. We just skip all this mess */
+ 		syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts);
++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64
++		/* Let's only support the 64 suffix syscalls for 64-bit time_t.
++		 * This simplifies the code for us as we don't need to convert
++		 * between 64-bit and 32-bit. We also don't have a way to
++		 * report overflow errors here.
++		 */
++		syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts);
+ #else
+ 		time(&ts.tv_sec);
+ #endif
+-- 
+2.18.2
+
package/busybox/0004-time-Use-64-prefix-syscall-if-we-have-to.patch new file +50 -0

50 lines not on this page · raw message

package/busybox/0005-runsv-Use-64-prefix-syscall-if-we-have-to.patch new file +50 -0

50 lines not on this page · raw message

package/busybox/0006-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file +134 -0

134 lines not on this page · raw message

Signature · 1 line
2.18.2
#2 lore raw

PATCH v6 2/2 package/busybox: fix build with glibc 2.31

In reply to unixmania at gmail.com

From: Carlos Santos <[email protected]>

Busybox 1.31.1 fails to build with glibc 2.31 due to the removal of stime() from glibc. Pull a patch already applied upstream to fix the problem.

The patch was rebased on version 1.31.1 to minimize the change, since the original one depended on a previous commit which is not worthwhile to pick.

Cc Romain Naour <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Yann E. MORIN. <[email protected]>
Cc arc-buildroot at synopsys.com

---
Supersedes: https://patchwork.ozlabs.org/patch/1259554/
---
Changes v6:
- Use 5 separate patches from upstream and split the Buildroot fix into two, one for the musl compatibility and other for the glibc, as suggested by Yann E. MORIN..
Changes v5:
- Drop the first patch, squash the other ones and rebase on v1.31.1, as suggested by Romain Naour
Changes v4:
- Rabase on the master branch
- Add SOB lines to patches

---
 .../0007-Remove-stime-function-calls.patch    | 97 +++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 package/busybox/0007-Remove-stime-function-calls.patch
package/busybox/0007-Remove-stime-function-calls.patch new file +97 -0
new file mode 100644
index 0000000000..58e1ced3de
@@ -0,0 +1,97 @@
+From 59102e499ac25c4311246d2b9417b3e5830cf851 Mon Sep 17 00:00:00 2001
+From: Alistair Francis <[email protected]>
+Date: Tue, 19 Nov 2019 13:06:40 +0100
+Subject: [PATCH] Remove stime() function calls
+
+stime() has been deprecated in glibc 2.31 and replaced with
+clock_settime(). Let's replace the stime() function calls with
+clock_settime() in preperation.
+
+function                                             old     new   delta
+rdate_main                                           197     224     +27
+clock_settime                                          -      27     +27
+date_main                                            926     941     +15
+stime                                                 37       -     -37
+------------------------------------------------------------------------------
+(add/remove: 2/2 grow/shrink: 2/0 up/down: 69/-37)             Total: 32 bytes
+
+Signed-off-by: Alistair Francis <[email protected]>
+Signed-off-by: Denys Vlasenko <[email protected]>
+
+(cherry picked from commit d3539be8f27b8cbfdfee460fe08299158f08bcd9)
+
+Signed-off-by: Carlos Santos <[email protected]>
+---
+ coreutils/date.c         | 6 +++++-
+ libbb/missing_syscalls.c | 8 --------
+ util-linux/rdate.c       | 8 ++++++--
+ 3 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/coreutils/date.c b/coreutils/date.c
+index e479c23a2..77a7d1368 100644
+--- a/coreutils/date.c
++++ b/coreutils/date.c
+@@ -276,6 +276,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
+ 		time(&ts.tv_sec);
+ #endif
+ 	}
++#if !ENABLE_FEATURE_DATE_NANO
++	ts.tv_nsec = 0;
++#endif
+ 	localtime_r(&ts.tv_sec, &tm_time);
+ 
+ 	/* If date string is given, update tm_time, and maybe set date */
+@@ -298,9 +301,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
+ 		if (date_str[0] != '@')
+ 			tm_time.tm_isdst = -1;
+ 		ts.tv_sec = validate_tm_time(date_str, &tm_time);
++		ts.tv_nsec = 0;
+ 
+ 		/* if setting time, set it */
+-		if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
++		if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
+ 			bb_perror_msg("can't set date");
+ 		}
+ 	}
+diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
+index 87cf59b3d..dc40d9155 100644
+--- a/libbb/missing_syscalls.c
++++ b/libbb/missing_syscalls.c
+@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
+ 	return syscall(__NR_getsid, pid);
+ }
+ 
+-int stime(const time_t *t)
+-{
+-	struct timeval tv;
+-	tv.tv_sec = *t;
+-	tv.tv_usec = 0;
+-	return settimeofday(&tv, NULL);
+-}
+-
+ int sethostname(const char *name, size_t len)
+ {
+ 	return syscall(__NR_sethostname, name, len);
+diff --git a/util-linux/rdate.c b/util-linux/rdate.c
+index 70f829e7f..878375d78 100644
+--- a/util-linux/rdate.c
++++ b/util-linux/rdate.c
+@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
+ 	if (!(flags & 2)) { /* no -p (-s may be present) */
+ 		if (time(NULL) == remote_time)
+ 			bb_error_msg("current time matches remote time");
+-		else
+-			if (stime(&remote_time) < 0)
++		else {
++			struct timespec ts;
++			ts.tv_sec = remote_time;
++			ts.tv_nsec = 0;
++			if (clock_settime(CLOCK_REALTIME, &ts) < 0)
+ 				bb_perror_msg_and_die("can't set time of day");
++		}
+ 	}
+ 
+ 	if (flags != 1) /* not lone -s */
+-- 
+2.18.2
+
Signature · 1 line
2.18.2
#3 lore raw

v6 cover package/busybox: fix build with glibc 2.31 and musl-1.2.0

In reply to unixmania at gmail.com

Carlos, All,

On 2020-03-22 14:12 -0300, unixmania at gmail.com spake thusly:

Quoted 6 lines

From: Carlos Santos <[email protected]>

Current release of busybox 1_31_1 is failing to build with glibc-2.31 due to removal of stime() from glibc. It also fails to build with musl 1.2.0 due to the direct use of __NR_clock_gettime.

Quoted 7 lines

Add five patches applied upstream to fix these problems.

Cc Romain Naour <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Yann E. MORIN. <[email protected]>

Series applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 19 lines

Carlos Santos (2):
package/busybox: fix build with musl 1.2.0
package/busybox: fix build with glibc 2.31

 ...-Use-64-prefix-syscall-if-we-have-to.patch |  61 ++++++++
 ...-Use-64-prefix-syscall-if-we-have-to.patch |  50 +++++++
 ...-Use-64-prefix-syscall-if-we-have-to.patch |  50 +++++++
 ...rappers-around-clock_gettime-closes-.patch | 134 ++++++++++++++++++
 .../0007-Remove-stime-function-calls.patch    |  97 +++++++++++++
 5 files changed, 392 insertions(+)
 create mode 100644 package/busybox/0003-date-Use-64-prefix-syscall-if-we-have-to.patch
 create mode 100644 package/busybox/0004-time-Use-64-prefix-syscall-if-we-have-to.patch
 create mode 100644 package/busybox/0005-runsv-Use-64-prefix-syscall-if-we-have-to.patch
 create mode 100644 package/busybox/0006-Remove-syscall-wrappers-around-clock_gettime-closes-.patch
 create mode 100644 package/busybox/0007-Remove-stime-function-calls.patch
Signature · 1 line
2.18.2
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'