From a3da46b2a4d0d2ee94327726b27e44c5e0ee2262 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Fri, 19 Feb 2021 23:00:42 +0100 Subject: busybox: update 1.33.0 Removed upstreamed patch. (From OE-Core rev: 79708b961b310a77b4b2e71fedf6dad4acd47507) Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie --- .../0001-hwclock-make-glibc-2.31-compatible.patch | 83 ---------------------- meta/recipes-core/busybox/busybox_1.32.0.bb | 54 -------------- meta/recipes-core/busybox/busybox_1.33.0.bb | 52 ++++++++++++++ 3 files changed, 52 insertions(+), 137 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch delete mode 100644 meta/recipes-core/busybox/busybox_1.32.0.bb create mode 100644 meta/recipes-core/busybox/busybox_1.33.0.bb (limited to 'meta') diff --git a/meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch b/meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch deleted file mode 100644 index 8d1f272120..0000000000 --- a/meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 5b2fc5746c352eb2b27bfc9fb224580d9852d0fa Mon Sep 17 00:00:00 2001 -From: Sakib Sajal -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 ---- - 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 - diff --git a/meta/recipes-core/busybox/busybox_1.32.0.bb b/meta/recipes-core/busybox/busybox_1.32.0.bb deleted file mode 100644 index 3a669444dd..0000000000 --- a/meta/recipes-core/busybox/busybox_1.32.0.bb +++ /dev/null @@ -1,54 +0,0 @@ -require busybox.inc - -SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ - file://busybox-udhcpc-no_deconfig.patch \ - file://find-touchscreen.sh \ - file://busybox-cron \ - file://busybox-httpd \ - file://busybox-udhcpd \ - file://default.script \ - file://simple.script \ - file://hwclock.sh \ - file://syslog \ - file://syslog-startup.conf \ - file://syslog.conf \ - file://busybox-syslog.default \ - file://mdev \ - file://mdev.conf \ - file://mdev-mount.sh \ - file://defconfig \ - file://busybox-syslog.service.in \ - file://busybox-klogd.service.in \ - file://fail_on_no_media.patch \ - file://run-ptest \ - file://inetd.conf \ - file://inetd \ - file://login-utilities.cfg \ - file://recognize_connmand.patch \ - file://busybox-cross-menuconfig.patch \ - file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \ - file://mount-via-label.cfg \ - file://sha1sum.cfg \ - file://sha256sum.cfg \ - file://getopts.cfg \ - file://resize.cfg \ - ${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \ - ${@["", "file://rcS.default"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \ - ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager') == 'busybox-mdev')]} \ - file://syslog.cfg \ - file://unicode.cfg \ - file://rcS \ - file://rcK \ - file://makefile-libbb-race.patch \ - file://0001-testsuite-check-uudecode-before-using-it.patch \ - 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" diff --git a/meta/recipes-core/busybox/busybox_1.33.0.bb b/meta/recipes-core/busybox/busybox_1.33.0.bb new file mode 100644 index 0000000000..1a3f218bca --- /dev/null +++ b/meta/recipes-core/busybox/busybox_1.33.0.bb @@ -0,0 +1,52 @@ +require busybox.inc + +SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ + file://busybox-udhcpc-no_deconfig.patch \ + file://find-touchscreen.sh \ + file://busybox-cron \ + file://busybox-httpd \ + file://busybox-udhcpd \ + file://default.script \ + file://simple.script \ + file://hwclock.sh \ + file://syslog \ + file://syslog-startup.conf \ + file://syslog.conf \ + file://busybox-syslog.default \ + file://mdev \ + file://mdev.conf \ + file://mdev-mount.sh \ + file://defconfig \ + file://busybox-syslog.service.in \ + file://busybox-klogd.service.in \ + file://fail_on_no_media.patch \ + file://run-ptest \ + file://inetd.conf \ + file://inetd \ + file://login-utilities.cfg \ + file://recognize_connmand.patch \ + file://busybox-cross-menuconfig.patch \ + file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \ + file://mount-via-label.cfg \ + file://sha1sum.cfg \ + file://sha256sum.cfg \ + file://getopts.cfg \ + file://resize.cfg \ + ${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \ + ${@["", "file://rcS.default"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \ + ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager') == 'busybox-mdev')]} \ + file://syslog.cfg \ + file://unicode.cfg \ + file://rcS \ + file://rcK \ + file://makefile-libbb-race.patch \ + file://0001-testsuite-check-uudecode-before-using-it.patch \ + 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://rev.cfg \ + file://pgrep.cfg \ +" +SRC_URI_append_libc-musl = " file://musl.cfg " + +SRC_URI[tarball.sha256sum] = "d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd" -- cgit v1.2.3-54-g00ecf