toybox: upgrade 0.8.8 -> 0.8.10

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2023-11-03 17:19:19 -07:00
parent e849f51ea9
commit 2e76660027
2 changed files with 2 additions and 41 deletions

View File

@ -1,37 +0,0 @@
From 7284c7ae0df9aa5a9c8aa0a81a018e17289fe2c4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 8 Sep 2022 07:22:26 -0700
Subject: [PATCH] portability: Fix timer_settime_wrap for 32bit systems with
64bit time_t
glibc does not define SYS_timer_settime if the 32bit syscall is not
available, new architectures like riscv32 has defaulted to 64bit time_t
from get go and avoided wiring 32bit syscall, therefore alias it to
64bit version here
Upstream-Status: Submitted [https://github.com/landley/toybox/pull/373]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
lib/portability.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/lib/portability.c b/lib/portability.c
index d955d081..4baa9367 100644
--- a/lib/portability.c
+++ b/lib/portability.c
@@ -711,6 +711,12 @@ int timer_create_wrap(clockid_t c, struct sigevent *se, timer_t *t)
return 0;
}
+#if !defined(SYS_timer_settime) && defined(SYS_timer_settime64)
+// glibc does not define defines SYS_timer_settime on 32-bit systems
+// with 64-bit time_t defaults e.g. riscv32
+#define SYS_timer_settime SYS_timer_settime64
+#endif
+
int timer_settime_wrap(timer_t t, int flags, struct itimerspec *val,
struct itimerspec *old)
{
--
2.37.3

View File

@ -7,10 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=78659a599b9325da368f2f1eb88f19c7"
inherit cml1 update-alternatives
SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \
file://0001-portability-Fix-timer_settime_wrap-for-32bit-systems.patch \
"
SRC_URI[sha256sum] = "dafd41978d40f02a61cf1be99a2b4a25812bbfb9c3157e679ee7611202d6ac58"
SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz"
SRC_URI[sha256sum] = "d3afee05ca90bf425ced73f527e418fecd626c5340b5f58711a14531f8d7d108"
SECTION = "base"