kexec-tools: bump to 2.0.32

Change log is available at: https://github.com/horms/kexec-tools/compare/v2.0.28...v2.0.32

Manually refreshed patch:
- 020-i386-improve-basename-compatibility.patch

Remove upstreamed patch:
- 010-Fix-building-on-x86_64-with-binutils-2.41.patch

Signed-off-by: Roc Lai <laipeng668@qq.com>
Link: https://github.com/openwrt/openwrt/pull/21623
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/package/boot/kexec-tools/Makefile b/package/boot/kexec-tools/Makefile
index 45500a120d79298c8825c794b19decb48f0c3960..e4723ef690dccecb44cb700faaceca75406e172f 100644 (file)
--- a/package/boot/kexec-tools/Makefile
+++ b/package/boot/kexec-tools/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kexec-tools
-PKG_VERSION:=2.0.28
-PKG_RELEASE:=2
+PKG_VERSION:=2.0.32
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/kexec
-PKG_HASH:=d2f0ef872f39e2fe4b1b01feb62b0001383207239b9f8041f98a95564161d053
+PKG_HASH:=8f81422a5fd2362cf6cb001b511e535565ed0f32c2f4451fb5eb68fed6710a5d
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=COPYING

diff --git a/package/boot/kexec-tools/patches/010-Fix-building-on-x86_64-with-binutils-2.41.patch b/package/boot/kexec-tools/patches/010-Fix-building-on-x86_64-with-binutils-2.41.patch
deleted file mode 100644 (file)
index bbb1281..0000000
--- a/package/boot/kexec-tools/patches/010-Fix-building-on-x86_64-with-binutils-2.41.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 328de8e00e298f00d7ba6b25dc3950147e9642e6 Mon Sep 17 00:00:00 2001
-From: Michel Lind <salimma@fedoraproject.org>
-Date: Tue, 30 Jan 2024 04:14:31 -0600
-Subject: [PATCH] Fix building on x86_64 with binutils 2.41
-
-Newer versions of the GNU assembler (observed with binutils 2.41) will
-complain about the ".arch i386" in files assembled with "as --64",
-with the message "Error: 64bit mode not supported on 'i386'".
-
-Fix by moving ".arch i386" below the relevant ".code32" directive, so
-that the assembler is no longer expecting 64-bit instructions to be used
-by the time that the ".arch i386" directive is encountered.
-
-Based on similar iPXE fix:
-https://github.com/ipxe/ipxe/commit/6ca597eee
-
-Signed-off-by: Michel Lind <michel@michel-slm.name>
-Signed-off-by: Simon Horman <horms@kernel.org>
----
- purgatory/arch/i386/entry32-16-debug.S | 2 +-
- purgatory/arch/i386/entry32-16.S       | 2 +-
- purgatory/arch/i386/entry32.S          | 2 +-
- purgatory/arch/i386/setup-x86.S        | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/purgatory/arch/i386/entry32-16-debug.S
-+++ b/purgatory/arch/i386/entry32-16-debug.S
-@@ -25,10 +25,10 @@
-       .globl entry16_debug_pre32
-       .globl entry16_debug_first32
-       .globl entry16_debug_old_first32
--      .arch i386
-       .balign 16
- entry16_debug:
-       .code32
-+      .arch i386
-       /* Compute where I am running at (assumes esp valid) */
-       call    1f
- 1:    popl    %ebx
---- a/purgatory/arch/i386/entry32-16.S
-+++ b/purgatory/arch/i386/entry32-16.S
-@@ -20,10 +20,10 @@
- #undef i386   
-       .text
-       .globl entry16, entry16_regs
--      .arch i386
-       .balign 16
- entry16:
-       .code32
-+      .arch i386
-       /* Compute where I am running at (assumes esp valid) */
-       call    1f
- 1:    popl    %ebx
---- a/purgatory/arch/i386/entry32.S
-+++ b/purgatory/arch/i386/entry32.S
-@@ -20,10 +20,10 @@
- #undef i386
- 
-       .text
--      .arch   i386
-       .globl entry32, entry32_regs
- entry32:
-       .code32
-+      .arch   i386
- 
-       /* Setup a gdt that should that is generally usefully */
-       lgdt    %cs:gdt
---- a/purgatory/arch/i386/setup-x86.S
-+++ b/purgatory/arch/i386/setup-x86.S
-@@ -21,10 +21,10 @@
- #undef i386
- 
-       .text
--      .arch   i386
-       .globl purgatory_start
- purgatory_start:
-       .code32
-+      .arch   i386
- 
-       /* Load a gdt so I know what the segment registers are */
-       lgdt    %cs:gdt

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
index 6f06e61c721b94c42581a6ff8eb93d41de7df49e..524832ce86ff1c4d1a96638a787348c8c2536bfb 100644 (file)
--- a/package/boot/kexec-tools/patches/020-i386-improve-basename-compatibility.patch
+++ b/package/boot/kexec-tools/patches/020-i386-improve-basename-compatibility.patch
@@ -15,7 +15,7 @@ Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
 
 --- a/kexec/arch/i386/x86-linux-setup.c
 +++ b/kexec/arch/i386/x86-linux-setup.c
-@@ -318,6 +318,7 @@ static int add_edd_entry(struct x86_linu
+@@ -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;
@@ -23,15 +23,15 @@ Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
  
        if (!current_mbr || !current_edd) {
                fprintf(stderr, "%s: current_edd and current_edd "
-@@ -329,9 +330,9 @@ static int add_edd_entry(struct x86_linu
-       memset(edd_info, 0, sizeof(struct edd_info));
+@@ -332,9 +333,9 @@ static int add_edd_entry(struct x86_linu
  
        /* extract the device number */
--      if (sscanf(basename(sysfs_name), "int13_dev%hhx", &devnum) != 1) {
+       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));
+-                              "entry: %s\n", basename(sysfs_name_copy));
 +                              "entry: %s\n", basename);
+               free(sysfs_name_copy);
                return -1;
        }
-