kexec-tools: remove upstreamed patch

Remove upstreamed patch:
- 020-i386-improve-basename-compatibility.patch

Link: https://github.com/horms/kexec-tools/commit/4fd0553cdfe397920d418d8b90ac52f8f1303a2d
Fixes: e75218ef4a27 ("kexec-tools: bump to 2.0.32")
Signed-off-by: Roc Lai <laipeng668@qq.com>
Link: https://github.com/openwrt/openwrt/pull/21652
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/boot/kexec-tools/Makefile b/package/boot/kexec-tools/Makefile
index e4723ef690dccecb44cb700faaceca75406e172f..b9cdc4544c7c30d301de19998aa57674701b4999 100644 (file)
--- a/package/boot/kexec-tools/Makefile
+++ b/package/boot/kexec-tools/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kexec-tools
 PKG_VERSION:=2.0.32
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/kexec

diff --git a/package/boot/kexec-tools/patches/020-i386-improve-basename-compatibility.patch b/package/boot/kexec-tools/patches/020-i386-improve-basename-compatibility.patch
deleted file mode 100644 (file)
index 524832c..0000000
--- a/package/boot/kexec-tools/patches/020-i386-improve-basename-compatibility.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 99f62f58fac57214ecc3c9aabf6bf61ac1e1201d Mon Sep 17 00:00:00 2001
-From: Tony Ambardar <itugrok@yahoo.com>
-Date: Fri, 7 Jun 2024 21:54:56 -0700
-Subject: [PATCH] i386: improve basename() compatibility
-
-Drop usage of glibc basename() in favour of a simpler implementation that
-works across GNU and musl libc, and is similar to existing code in fs2dt.c.
-
-This fixes compile errors seen building against musl.
-
-Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
----
- kexec/arch/i386/x86-linux-setup.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/kexec/arch/i386/x86-linux-setup.c
-+++ b/kexec/arch/i386/x86-linux-setup.c
-@@ -320,6 +320,7 @@ static int add_edd_entry(struct x86_linu
-       uint8_t devnum, version;
-       uint32_t mbr_sig;
-       struct edd_info *edd_info;
-+      char *basename = strrchr(sysfs_name,'/') + 1;
- 
-       if (!current_mbr || !current_edd) {
-               fprintf(stderr, "%s: current_edd and current_edd "
-@@ -332,9 +333,9 @@ static int add_edd_entry(struct x86_linu
- 
-       /* extract the device number */
-       char* sysfs_name_copy = strdup(sysfs_name);
--      if (sscanf(basename(sysfs_name_copy), "int13_dev%hhx", &devnum) != 1) {
-+      if (sscanf(basename, "int13_dev%hhx", &devnum) != 1) {
-               fprintf(stderr, "Invalid format of int13_dev dir "
--                              "entry: %s\n", basename(sysfs_name_copy));
-+                              "entry: %s\n", basename);
-               free(sysfs_name_copy);
-               return -1;
-       }