mirror of
https://github.com/pygos/build.git
synced 2024-11-24 20:10:42 +01:00
Bump busybox version
Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
This commit is contained in:
parent
21228b2910
commit
94fae0c950
6 changed files with 350 additions and 3 deletions
53
pkg/bbstatic/0001.patch
Normal file
53
pkg/bbstatic/0001.patch
Normal file
|
|
@ -0,0 +1,53 @@
|
||||||
|
From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alistair Francis <alistair.francis@wdc.com>
|
||||||
|
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.
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a]
|
||||||
|
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
|
||||||
|
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
|
||||||
|
---
|
||||||
|
coreutils/date.c | 11 +++++++++--
|
||||||
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
--- 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, cha
|
||||||
|
*/
|
||||||
|
#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
|
||||||
43
pkg/bbstatic/0002.patch
Normal file
43
pkg/bbstatic/0002.patch
Normal file
|
|
@ -0,0 +1,43 @@
|
||||||
|
From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alistair Francis <alistair.francis@wdc.com>
|
||||||
|
Date: Wed, 18 Sep 2019 09:28:50 -0700
|
||||||
|
Subject: [PATCH] time: 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 report a compilation error. This avoids us have to
|
||||||
|
deal with converting between 64-bit and 32-bit values. There are
|
||||||
|
currently no architectures where this is the case.
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62]
|
||||||
|
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
|
||||||
|
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
|
||||||
|
---
|
||||||
|
libbb/time.c | 7 +++++++
|
||||||
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
|
--- a/libbb/time.c
|
||||||
|
+++ b/libbb/time.c
|
||||||
|
@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS(
|
||||||
|
* typically requiring -lrt. We just skip all this mess */
|
||||||
|
static void get_mono(struct timespec *ts)
|
||||||
|
{
|
||||||
|
- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
|
||||||
|
+#if defined(__NR_clock_gettime)
|
||||||
|
+ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
|
||||||
|
+#elif __TIMESIZE == 64
|
||||||
|
+ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts))
|
||||||
|
+#else
|
||||||
|
+# error "We currently don't support architectures without " \
|
||||||
|
+ "the __NR_clock_gettime syscall and 32-bit time_t"
|
||||||
|
+#endif
|
||||||
|
bb_error_msg_and_die("clock_gettime(MONOTONIC) failed");
|
||||||
|
}
|
||||||
|
unsigned long long FAST_FUNC monotonic_ns(void)
|
||||||
46
pkg/bbstatic/0003.patch
Normal file
46
pkg/bbstatic/0003.patch
Normal file
|
|
@ -0,0 +1,46 @@
|
||||||
|
From 8c7419649d6e6fda8fa7d0e863084c78ac728628 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alistair Francis <alistair.francis@wdc.com>
|
||||||
|
Date: Wed, 28 Aug 2019 10:54:15 -0700
|
||||||
|
Subject: [PATCH 3/3] runsv: 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 report a compilation error. This avoids us have to
|
||||||
|
deal with converting between 64-bit and 32-bit values. There are
|
||||||
|
currently no architectures where this is the case.
|
||||||
|
|
||||||
|
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
|
||||||
|
Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=ad27d44ebe950335616f37e36863469dc181b455]
|
||||||
|
---
|
||||||
|
runit/runsv.c | 7 +++++++
|
||||||
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/runit/runsv.c b/runit/runsv.c
|
||||||
|
index ccc762d78..737909b0e 100644
|
||||||
|
--- a/runit/runsv.c
|
||||||
|
+++ b/runit/runsv.c
|
||||||
|
@@ -55,7 +55,14 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
* typically requiring -lrt. We just skip all this mess */
|
||||||
|
static void gettimeofday_ns(struct timespec *ts)
|
||||||
|
{
|
||||||
|
+#if defined(__NR_clock_gettime)
|
||||||
|
syscall(__NR_clock_gettime, CLOCK_REALTIME, ts);
|
||||||
|
+#elif __TIMESIZE == 64
|
||||||
|
+ syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts);
|
||||||
|
+#else
|
||||||
|
+# error "We currently don't support architectures without " \
|
||||||
|
+ "the __NR_clock_gettime syscall and 32-bit time_t"
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
static void gettimeofday_ns(struct timespec *ts)
|
||||||
|
--
|
||||||
|
2.22.0
|
||||||
|
|
||||||
120
pkg/bbstatic/0004.patch
Normal file
120
pkg/bbstatic/0004.patch
Normal file
|
|
@ -0,0 +1,120 @@
|
||||||
|
From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Denys Vlasenko <vda.linux@googlemail.com>
|
||||||
|
Date: Thu, 24 Oct 2019 16:26:55 +0200
|
||||||
|
Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091
|
||||||
|
|
||||||
|
12091 "Direct use of __NR_clock_gettime is not time64-safe".
|
||||||
|
|
||||||
|
function old new delta
|
||||||
|
runsv_main 1698 1712 +14
|
||||||
|
startservice 378 383 +5
|
||||||
|
get_mono 31 25 -6
|
||||||
|
date_main 932 926 -6
|
||||||
|
gettimeofday_ns 17 - -17
|
||||||
|
------------------------------------------------------------------------------
|
||||||
|
(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954]
|
||||||
|
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
|
||||||
|
---
|
||||||
|
Makefile.flags | 6 ++++--
|
||||||
|
coreutils/date.c | 16 +++-------------
|
||||||
|
libbb/time.c | 11 +----------
|
||||||
|
runit/runsv.c | 11 +----------
|
||||||
|
4 files changed, 9 insertions(+), 35 deletions(-)
|
||||||
|
|
||||||
|
--- a/Makefile.flags
|
||||||
|
+++ b/Makefile.flags
|
||||||
|
@@ -129,10 +129,12 @@ endif
|
||||||
|
# fall back to using a temp file:
|
||||||
|
CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c)
|
||||||
|
ifeq ($(CRYPT_AVAILABLE),y)
|
||||||
|
-LDLIBS += m crypt
|
||||||
|
+LDLIBS += m rt crypt
|
||||||
|
else
|
||||||
|
-LDLIBS += m
|
||||||
|
+LDLIBS += m rt
|
||||||
|
endif
|
||||||
|
+# libm may be needed for dc, awk, ntpd
|
||||||
|
+# librt may be needed for clock_gettime()
|
||||||
|
|
||||||
|
# libpam may use libpthread, libdl and/or libaudit.
|
||||||
|
# On some platforms that requires an explicit -lpthread, -ldl, -laudit.
|
||||||
|
--- a/coreutils/date.c
|
||||||
|
+++ b/coreutils/date.c
|
||||||
|
@@ -33,10 +33,9 @@
|
||||||
|
//config: Enable option (-I) to output an ISO-8601 compliant
|
||||||
|
//config: date/time string.
|
||||||
|
//config:
|
||||||
|
-//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) or syscall(__NR_clock_gettime64)
|
||||||
|
+//config: default n # stat's nanosecond field is a bit non-portable
|
||||||
|
//config: depends on DATE
|
||||||
|
//config: select PLATFORM_LINUX
|
||||||
|
//config: help
|
||||||
|
@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha
|
||||||
|
*/
|
||||||
|
#endif
|
||||||
|
} else {
|
||||||
|
-#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);
|
||||||
|
+#if ENABLE_FEATURE_DATE_NANO
|
||||||
|
+ clock_gettime(CLOCK_REALTIME, &ts);
|
||||||
|
#else
|
||||||
|
time(&ts.tv_sec);
|
||||||
|
#endif
|
||||||
|
--- a/libbb/time.c
|
||||||
|
+++ b/libbb/time.c
|
||||||
|
@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS(
|
||||||
|
#define CLOCK_MONOTONIC 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-/* libc has incredibly messy way of doing this,
|
||||||
|
- * typically requiring -lrt. We just skip all this mess */
|
||||||
|
static void get_mono(struct timespec *ts)
|
||||||
|
{
|
||||||
|
-#if defined(__NR_clock_gettime)
|
||||||
|
- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
|
||||||
|
-#elif __TIMESIZE == 64
|
||||||
|
- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts))
|
||||||
|
-#else
|
||||||
|
-# error "We currently don't support architectures without " \
|
||||||
|
- "the __NR_clock_gettime syscall and 32-bit time_t"
|
||||||
|
-#endif
|
||||||
|
+ if (clock_gettime(CLOCK_MONOTONIC, ts))
|
||||||
|
bb_error_msg_and_die("clock_gettime(MONOTONIC) failed");
|
||||||
|
}
|
||||||
|
unsigned long long FAST_FUNC monotonic_ns(void)
|
||||||
|
--- a/runit/runsv.c
|
||||||
|
+++ b/runit/runsv.c
|
||||||
|
@@ -51,18 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG
|
||||||
|
#if ENABLE_MONOTONIC_SYSCALL
|
||||||
|
#include <sys/syscall.h>
|
||||||
|
|
||||||
|
-/* libc has incredibly messy way of doing this,
|
||||||
|
- * typically requiring -lrt. We just skip all this mess */
|
||||||
|
static void gettimeofday_ns(struct timespec *ts)
|
||||||
|
{
|
||||||
|
-#if defined(__NR_clock_gettime)
|
||||||
|
- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts);
|
||||||
|
-#elif __TIMESIZE == 64
|
||||||
|
- syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts);
|
||||||
|
-#else
|
||||||
|
-# error "We currently don't support architectures without " \
|
||||||
|
- "the __NR_clock_gettime syscall and 32-bit time_t"
|
||||||
|
-#endif
|
||||||
|
+ clock_gettime(CLOCK_REALTIME, ts);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
static void gettimeofday_ns(struct timespec *ts)
|
||||||
85
pkg/bbstatic/0005.patch
Normal file
85
pkg/bbstatic/0005.patch
Normal file
|
|
@ -0,0 +1,85 @@
|
||||||
|
From d3539be8f27b8cbfdfee460fe08299158f08bcd9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alistair Francis <alistair.francis@wdc.com>
|
||||||
|
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
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=d3539be8f27b8cbfdfee460fe08299158f08bcd9]
|
||||||
|
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
|
||||||
|
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
|
||||||
|
---
|
||||||
|
coreutils/date.c | 6 +++++-
|
||||||
|
libbb/missing_syscalls.c | 8 --------
|
||||||
|
util-linux/rdate.c | 8 ++++++--
|
||||||
|
3 files changed, 11 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
--- a/coreutils/date.c
|
||||||
|
+++ b/coreutils/date.c
|
||||||
|
@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, cha
|
||||||
|
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 */
|
||||||
|
@@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, cha
|
||||||
|
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");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--- 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);
|
||||||
|
--- a/util-linux/rdate.c
|
||||||
|
+++ b/util-linux/rdate.c
|
||||||
|
@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, ch
|
||||||
|
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 */
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
VERSION="1.31.0"
|
VERSION="1.31.1"
|
||||||
SRCDIR="busybox-$VERSION"
|
SRCDIR="busybox-$VERSION"
|
||||||
TARBALL="busybox-$VERSION.tar.bz2"
|
TARBALL="busybox-$VERSION.tar.bz2"
|
||||||
URL="https://busybox.net/downloads"
|
URL="https://busybox.net/downloads"
|
||||||
SHA256SUM="0e4925392fd9f3743cc517e031b68b012b24a63b0cf6c1ff03cce7bb3846cc99"
|
SHA256SUM="d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998"
|
||||||
DEPENDS="toolchain"
|
DEPENDS="toolchain"
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
return
|
apply_patches
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue