busybox: upgrade 1.32.0 ->1.33.0
PATCH 1/1 busybox: upgrade 1.32.0 ->1.33.0
0001-hwclock-make-glibc-2.31-compatible.patch
removed sincie it is not available in 1.33.0
---
...1-hwclock-make-glibc-2.31-compatible.patch | 83 -------------------
.../{busybox_1.32.0.bb => busybox_1.33.0.bb} | 5 +-
2 files changed, 2 insertions(+), 86 deletions(-)
delete mode 100644 meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch
rename meta/recipes-core/busybox/{busybox_1.32.0.bb => busybox_1.33.0.bb} (90%)meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch deleted +0 -83
@@ -1,83 +0,0 @@ -From 5b2fc5746c352eb2b27bfc9fb224580d9852d0fa Mon Sep 17 00:00:00 2001 -From: Sakib Sajal <[email protected]> -Date: Fri, 17 Jul 2020 17:27:21 +0000 -Subject: [PATCH] hwclock: make glibc 2.31 compatible - -NEWS for glibc version 2.31 -=========================== - -Deprecated and removed features, and other changes affecting compatibility: - -* The settimeofday function can still be used to set a system-wide - time zone when the operating system supports it. This is because - the Linux kernel reused the API, on some architectures, to describe - a system-wide time-zone-like offset between the software clock - maintained by the kernel, and the "RTC" clock that keeps time when - the system is shut down. - - However, to reduce the odds of this offset being set by accident, - settimeofday can no longer be used to set the time and the offset - simultaneously. If both of its two arguments are non-null, the call - will fail (setting errno to EINVAL). - - Callers attempting to set this offset should also be prepared for - the call to fail and set errno to ENOSYS; this already happens on - the Hurd and on some Linux architectures. The Linux kernel - maintainers are discussing a more principled replacement for the - reused API. After a replacement becomes available, we will change - settimeofday to fail with ENOSYS on all platforms when its 'tzp' - argument is not a null pointer. - - settimeofday itself is obsolescent according to POSIX. Programs - that set the system time should use clock_settime and/or the adjtime - family of functions instead. We may cease to make settimeofday - available to newly linked binaries after there is a replacement for - Linux's time-zone-like offset API. - -hwclock had two calls to settimeofday, in functions to_sys_clock and -set_system_clock_timezone, where both the arguments to settimeofday -were valid (non-null). -Therefore, split the call, once for timezone and once for timeval. - -Fixes #12756 - -Upstream-Status: Pending - -Signed-off-by: Sakib Sajal <[email protected]> ---- - util-linux/hwclock.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c -index dc97d8f..cf346e8 100644 ---- a/util-linux/hwclock.c -+++ b/util-linux/hwclock.c -@@ -131,8 +131,10 @@ static void to_sys_clock(const char **pp_rtcname, int utc) - - tv.tv_sec = read_rtc(pp_rtcname, NULL, utc); - tv.tv_usec = 0; -- if (settimeofday(&tv, &tz)) -- bb_simple_perror_msg_and_die("settimeofday"); -+ if (settimeofday(NULL, &tz)) -+ bb_simple_perror_msg_and_die("settimeofday: timezone"); -+ if (settimeofday(&tv, NULL)) -+ bb_simple_perror_msg_and_die("settimeofday: timeval"); - } - - static void from_sys_clock(const char **pp_rtcname, int utc) -@@ -283,8 +285,10 @@ static void set_system_clock_timezone(int utc) - gettimeofday(&tv, NULL); - if (!utc) - tv.tv_sec += tz.tz_minuteswest * 60; -- if (settimeofday(&tv, &tz)) -- bb_simple_perror_msg_and_die("settimeofday"); -+ if (settimeofday(NULL, &tz)) -+ bb_simple_perror_msg_and_die("settimeofday: timezone"); -+ if (settimeofday(&tv, NULL)) -+ bb_simple_perror_msg_and_die("settimeofday: timeval"); - } - - //usage:#define hwclock_trivial_usage --- -2.24.1 -
meta/recipes-core/busybox/busybox_1.33.0.bb renamed from meta/recipes-core/busybox/busybox_1.32.0.bb +2 -3
@@ -44,11 +44,10 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ - file://0001-hwclock-make-glibc-2.31-compatible.patch \ file://rev.cfg \ file://pgrep.cfg \ " SRC_URI_append_libc-musl = " file://musl.cfg " -SRC_URI[tarball.md5sum] = "9576986f1a960da471d03b72a62f13c7" -SRC_URI[tarball.sha256sum] = "c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689" +SRC_URI[tarball.md5sum] = "eb0e85d59015ddcd8d2219f42c8844ac" +SRC_URI[tarball.sha256sum] = "d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd"
Signature · 1 line
2.25.1
Hello,
Do we have to continue with unstable version? Isn't the stable version (1.32.1) a better choice?
Cheers,
Andrej
Quoted 116 lines
0001-hwclock-make-glibc-2.31-compatible.patch
removed sincie it is not available in 1.33.0Signed-off-by Wang Mingyu <[email protected]>--- ...1-hwclock-make-glibc-2.31-compatible.patch | 83 ------------------- .../{busybox_1.32.0.bb => busybox_1.33.0.bb} | 5 +- 2 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox/0001-hwclock-> make-glibc-2.31-compatible.patch rename meta/recipes-core/busybox/{busybox_1.32.0.bb => busybox_1.33.0.bb} (90%)meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch deleted +0
-79@@ -1,83 +0,0 @@ -From 5b2fc5746c352eb2b27bfc9fb224580d9852d0fa Mon Sep 17 00:00:00 2001 -From: Sakib Sajal <[email protected]> -Date: Fri, 17 Jul 2020 17:27:21 +0000 -Subject: [PATCH] hwclock: make glibc 2.31 compatible - -NEWS for glibc version 2.31 -=========================== - -Deprecated and removed features, and other changes affecting compatibility: - -* The settimeofday function can still be used to set a system-wide - time zone when the operating system supports it. This is because - the Linux kernel reused the API, on some architectures, to describe - a system-wide time-zone-like offset between the software clock - maintained by the kernel, and the "RTC" clock that keeps time when - the system is shut down. - - However, to reduce the odds of this offset being set by accident, - settimeofday can no longer be used to set the time and the offset - simultaneously. If both of its two arguments are non-null, the call - will fail (setting errno to EINVAL). - - Callers attempting to set this offset should also be prepared for - the call to fail and set errno to ENOSYS; this already happens on - the Hurd and on some Linux architectures. The Linux kernel - maintainers are discussing a more principled replacement for the - reused API. After a replacement becomes available, we will change - settimeofday to fail with ENOSYS on all platforms when its 'tzp' - argument is not a null pointer. - - settimeofday itself is obsolescent according to POSIX. Programs - that set the system time should use clock_settime and/or the adjtime - family of functions instead. We may cease to make settimeofday - available to newly linked binaries after there is a replacement for - Linux's time-zone-like offset API. - -hwclock had two calls to settimeofday, in functions to_sys_clock and -set_system_clock_timezone, where both the arguments to settimeofday -were valid (non-null). -Therefore, split the call, once for timezone and once for timeval. - -Fixes #12756 - -Upstream-Status: Pending - -Signed-off-by: Sakib Sajal <[email protected]> ---- - util-linux/hwclock.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c -index dc97d8f..cf346e8 100644 ---- a/util-linux/hwclock.c -+++ b/util-linux/hwclock.c -@@ -131,8 +131,10 @@ static void to_sys_clock(const char **pp_rtcname, int utc) - - tv.tv_sec = read_rtc(pp_rtcname, NULL, utc); - tv.tv_usec = 0; -- if (settimeofday(&tv, &tz)) -- bb_simple_perror_msg_and_die("settimeofday"); -+ if (settimeofday(NULL, &tz)) -+ bb_simple_perror_msg_and_die("settimeofday: timezone"); -+ if (settimeofday(&tv, NULL)) -+ bb_simple_perror_msg_and_die("settimeofday: timeval"); - } - - static void from_sys_clock(const char **pp_rtcname, int utc) -@@ -283,8 +285,10 @@ static void set_system_clock_timezone(int utc) - gettimeofday(&tv, NULL); - if (!utc) - tv.tv_sec += tz.tz_minuteswest * 60; -- if (settimeofday(&tv, &tz)) -- bb_simple_perror_msg_and_die("settimeofday"); -+ if (settimeofday(NULL, &tz)) -+ bb_simple_perror_msg_and_die("settimeofday: timezone"); -+ if (settimeofday(&tv, NULL)) -+ bb_simple_perror_msg_and_die("settimeofday: timeval"); - } - - //usage:#define hwclock_trivial_usage --- -2.24.1 -meta/recipes-core/busybox/busybox_1.33.0.bb renamed from meta/recipes-core/busybox/busybox_1.32.0.bb +2
-4@@ -44,11 +44,10 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ - file://0001-hwclock-make-glibc-2.31-compatible.patch \ file://rev.cfg \ file://pgrep.cfg \ " SRC_URI_append_libc-musl = " file://musl.cfg " -SRC_URI[tarball.md5sum] = "9576986f1a960da471d03b72a62f13c7" -SRC_URI[tarball.sha256sum] = "c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689" +SRC_URI[tarball.md5sum] = "eb0e85d59015ddcd8d2219f42c8844ac" +SRC_URI[tarball.sha256sum] = "d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd" --2.25.1
Or wait for 1.33.1. Maybe UPSTREAM_CHECK_REGEX should be set up to exclude x.y.0 versions.
Alex
Quoted 148 lines · Andrej Valek
Hello,
Do we have to continue with unstable version? Isn't the stable version (1.32.1) a better choice?Cheers,
AndrejQuoted 6 lines
0001-hwclock-make-glibc-2.31-compatible.patch
removed sincie it is not available in 1.33.0Signed-off-by Wang Mingyu <[email protected]>--- ...1-hwclock-make-glibc-2.31-compatible.patch | 83 -------------------.../{busybox_1.32.0.bb => busybox_1.33.0.bb} | 5 +-
Quoted 1 line
2 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644meta/recipes-core/busybox/busybox/0001-hwclock->
make-glibc-2.31-compatible.patchQuoted 1 line
rename meta/recipes-core/busybox/{busybox_1.32.0.bb =>busybox_1.33.0.bb} (90%)
Quoted 2 lines
diff --git
a/meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patchb/meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patchQuoted 3 lines
deleted file mode 100644
index 8d1f272120..0000000000
---
a/meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patchmeta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch line 9
Quoted 11 lines
+++
/dev/nullmeta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch deleted +0
-9@@ -1,83 +0,0 @@ -From 5b2fc5746c352eb2b27bfc9fb224580d9852d0fa Mon Sep 17 00:00:00 2001 -From: Sakib Sajal <[email protected]> -Date: Fri, 17 Jul 2020 17:27:21 +0000 -Subject: [PATCH] hwclock: make glibc 2.31 compatible - -NEWS for glibc version 2.31 -=========================== - -Deprecated and removed features, and other changes affectingcompatibility:
Quoted 18 lines
meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch deleted +0
-18- -* The settimeofday function can still be used to set a system-wide - time zone when the operating system supports it. This is because - the Linux kernel reused the API, on some architectures, to describe - a system-wide time-zone-like offset between the software clock - maintained by the kernel, and the "RTC" clock that keeps time when - the system is shut down. - - However, to reduce the odds of this offset being set by accident, - settimeofday can no longer be used to set the time and the offset - simultaneously. If both of its two arguments are non-null, the call - will fail (setting errno to EINVAL). - - Callers attempting to set this offset should also be prepared for - the call to fail and set errno to ENOSYS; this already happens on - the Hurd and on some Linux architectures. The Linux kernel - maintainers are discussing a more principled replacement for the - reused API. After a replacement becomes available, we will changemeta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch line 37
Quoted 10 lines
meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch deleted +0
-10- settimeofday to fail with ENOSYS on all platforms when its 'tzp' - argument is not a null pointer. - - settimeofday itself is obsolescent according to POSIX. Programs - that set the system time should use clock_settime and/or the adjtime - family of functions instead. We may cease to make settimeofday - available to newly linked binaries after there is a replacement for - Linux's time-zone-like offset API. - -hwclock had two calls to settimeofday, in functions to_sys_clock and-set_system_clock_timezone, where both the arguments to settimeofday -were valid (non-null).
meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch
Quoted 12 lines
meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch deleted +0
-12-Therefore, split the call, once for timezone and once for timeval. - -Fixes #12756 - -Upstream-Status: Pending - -Signed-off-by: Sakib Sajal <[email protected]> ---- - util-linux/hwclock.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c -indexdc97d8f..cf346e8 100644
meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch
Quoted 3 lines
meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch deleted +0
-3---- a/util-linux/hwclock.c -+++ b/util-linux/hwclock.c -@@ -131,8 +131,10 @@ static void to_sys_clock(const char **pp_rtcname,int utc)
meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch
Quoted 12 lines
meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch deleted +0
-12- - tv.tv_sec = read_rtc(pp_rtcname, NULL, utc); - tv.tv_usec = 0; -- if (settimeofday(&tv, &tz)) -- bb_simple_perror_msg_and_die("settimeofday"); -+ if (settimeofday(NULL, &tz)) -+ bb_simple_perror_msg_and_die("settimeofday: timezone"); -+ if (settimeofday(&tv, NULL)) -+ bb_simple_perror_msg_and_die("settimeofday: timeval"); - } - - static void from_sys_clock(const char **pp_rtcname, int utc) -@@-283,8 +285,10 @@ static void
set_system_clock_timezone(int utc)Review
Quoted 16 lines
meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch deleted +0
-15- gettimeofday(&tv, NULL); - if (!utc) - tv.tv_sec += tz.tz_minuteswest * 60; -- if (settimeofday(&tv, &tz)) -- bb_simple_perror_msg_and_die("settimeofday"); -+ if (settimeofday(NULL, &tz)) -+ bb_simple_perror_msg_and_die("settimeofday: timezone"); -+ if (settimeofday(&tv, NULL)) -+ bb_simple_perror_msg_and_die("settimeofday: timeval"); - } - - //usage:#define hwclock_trivial_usage --- -2.24.1 -(quoted diff) +0
-0b/meta/recipes-core/busybox/busybox_1.33.0.bb
meta/recipes-core/busybox/busybox_1.33.0.bb SRC_URI = "
Quoted 7 lines
similarity index 90%
rename from meta/recipes-core/busybox/busybox_1.32.0.bb rename to meta/recipes-core/busybox/busybox_1.33.0.bb index3a669444dd..ec8f350955100644meta/recipes-core/busybox/busybox_1.33.0.bb renamed from meta/recipes-core/busybox/busybox_1.32.0.bb +0
-0@@ -44,11 +44,10 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
meta/recipes-core/busybox/busybox_1.33.0.bb SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ · line 51
Quoted 2 lines
meta/recipes-core/busybox/busybox_1.33.0.bb renamed from meta/recipes-core/busybox/busybox_1.32.0.bb +0
-0file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \
meta/recipes-core/busybox/busybox_1.33.0.bb SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
Quoted 8 lines
meta/recipes-core/busybox/busybox_1.33.0.bb renamed from meta/recipes-core/busybox/busybox_1.32.0.bb +0
-3- file://0001-hwclock-make-glibc-2.31-compatible.patch \ file://rev.cfg \ file://pgrep.cfg \ " SRC_URI_append_libc-musl = " file://musl.cfg " -SRC_URI[tarball.md5sum] = "9576986f1a960da471d03b72a62f13c7" -SRC_URI[tarball.sha256sum] ="
c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689"meta/recipes-core/busybox/busybox_1.33.0.bb SRC_URI = " · line 52
Quoted 2 lines
meta/recipes-core/busybox/busybox_1.33.0.bb renamed from meta/recipes-core/busybox/busybox_1.32.0.bb +2
-0+SRC_URI[tarball.md5sum] = "eb0e85d59015ddcd8d2219f42c8844ac" +SRC_URI[tarball.sha256sum] ="
d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd"Quoted 2 lines
meta/recipes-core/busybox/busybox_1.33.0.bb renamed from meta/recipes-core/busybox/busybox_1.32.0.bb +0
-1--2.25.1