deleted file mode 100644
@@ -1,54 +0,0 @@
-From 32c8ffa7ace6f1b7e63f9ddffab00b00c36a7b57 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 15 May 2024 21:18:08 -0700
-Subject: [PATCH] x86-linux-setup.c: Use POSIX basename API
-
-Musl C library only supports POSIX basename function. while glibc has
-both GNU extention as well as POSIX basename implemented. Switch to
-using posix version, so it can work across musl and glibc
-
-basename prototype has been removed from string.h from latest musl [1]
-compilers e.g. clang-18/GCC-14 flags the absense of prototype as error.
-therefore include libgen.h for providing it.
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Upstream-Status: Submitted [https://lists.infradead.org/pipermail/kexec/2024-May/030034.html]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- kexec/arch/i386/x86-linux-setup.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c
-index 9a281dc..73251b9 100644
---- a/kexec/arch/i386/x86-linux-setup.c
-+++ b/kexec/arch/i386/x86-linux-setup.c
-@@ -14,6 +14,7 @@
- *
- */
- #define _GNU_SOURCE
-+#include <libgen.h>
- #include <stdint.h>
- #include <stdio.h>
- #include <string.h>
-@@ -329,12 +330,14 @@ static int add_edd_entry(struct x86_linux_param_header *real_mode,
- memset(edd_info, 0, sizeof(struct edd_info));
-
- /* 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) {
- fprintf(stderr, "Invalid format of int13_dev dir "
-- "entry: %s\n", basename(sysfs_name));
-+ "entry: %s\n", basename(sysfs_name_copy));
-+ free(sysfs_name_copy);
- return -1;
- }
--
-+ free(sysfs_name_copy);
- /* if there's a MBR signature, then add it */
- if (file_scanf(sysfs_name, "mbr_signature", "0x%x", &mbr_sig) == 1) {
- real_mode->edd_mbr_sig_buffer[*current_mbr] = mbr_sig;
-2.45.1
-
deleted file mode 100644
@@ -1,50 +0,0 @@
-From b62c1da8f8e641397add10367ee9c4cfdedb1cc0 Mon Sep 17 00:00:00 2001
-From: Haiqing Bai <Haiqing.Bai@windriver.com>
-Date: Mon, 9 Jan 2017 15:26:29 +0800
-Subject: [PATCH] kexec: ARM: Fix add_buffer_phys_virt() align issue
-
-When "CONFIG_ARM_LPAE" is enabled,3 level page table
-is used by MMU, the "SECTION_SIZE" is defined with
-(1 << 21), but 'add_buffer_phys_virt()' hardcode this
-to (1 << 20).
-
-Upstream-Status: Submitted [via email to horms@kernel.org,http://lists.infradead.org/pipermail/kexec/2024-April/029903.html]
-
-Suggested-By:fredrik.markstrom@gmail.com
-Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
-
----
- kexec/arch/arm/crashdump-arm.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c
-index 1ec1826..cc20f63 100644
---- a/kexec/arch/arm/crashdump-arm.c
-+++ b/kexec/arch/arm/crashdump-arm.c
-@@ -242,6 +242,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline)
- void *buf;
- int err;
- int last_ranges;
-+ unsigned short align_bit_shift = 20;
-
- /*
- * First fetch all the memory (RAM) ranges that we are going to pass to
-@@ -283,6 +284,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline)
-
- /* for support LPAE enabled kernel*/
- elf_info.class = ELFCLASS64;
-+ align_bit_shift = 21;
-
- err = crash_create_elf64_headers(info, &elf_info,
- usablemem_rgns.ranges,
-@@ -304,8 +306,9 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline)
- * 1MB) so that available memory passed in kernel command line will be
- * aligned to 1MB. This is because kernel create_mapping() wants memory
- * regions to be aligned to SECTION_SIZE.
-+ * The SECTION_SIZE of LPAE kernel is '1UL << 21' defined in pgtable-3level.h
- */
-- elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 1 << 20,
-+ elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 1 << align_bit_shift,
- crash_kernel_mem.start,
- crash_kernel_mem.end, -1, 0);
-
deleted file mode 100644
@@ -1,95 +0,0 @@
-From 0000000000000000000000000000000000000000 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>
-
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?h=main&id=328de8e00e298f00d7ba6b25dc3950147e9642e6]
-Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
----
- 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(-)
-
-diff --git a/purgatory/arch/i386/entry32-16-debug.S b/purgatory/arch/i386/entry32-16-debug.S
-index 5167944..12e1164 100644
---- 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
-diff --git a/purgatory/arch/i386/entry32-16.S b/purgatory/arch/i386/entry32-16.S
-index c051aab..eace095 100644
---- 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
-diff --git a/purgatory/arch/i386/entry32.S b/purgatory/arch/i386/entry32.S
-index f7a494f..8ce9e31 100644
---- 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
-diff --git a/purgatory/arch/i386/setup-x86.S b/purgatory/arch/i386/setup-x86.S
-index 201bb2c..a212eed 100644
---- 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
-2.39.2
-
similarity index 87%
rename from meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb
rename to meta/recipes-kernel/kexec/kexec-tools_2.0.29.bb
@@ -1,11 +1,11 @@
-
SUMMARY = "Kexec fast reboot tools"
DESCRIPTION = "Kexec is a fast reboot feature that lets you reboot to a new Linux kernel"
HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/"
SECTION = "kernel/userland"
LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
- file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09 \
+ "
DEPENDS = "zlib xz"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
@@ -14,14 +14,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
file://kdump.service \
file://0001-powerpc-change-the-memory-size-limit.patch \
file://0002-purgatory-Pass-r-directly-to-linker.patch \
- file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
file://0005-Disable-PIE-during-link.patch \
file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \
- file://Fix-building-on-x86_64-with-binutils-2.41.patch \
- file://0001-x86-linux-setup.c-Use-POSIX-basename-API.patch \
"
-SRC_URI[sha256sum] = "f33d2660b3e38d25a127e87097978e0f7a9a73ab5151a29eb80974d169ff6a29"
+SRC_URI[sha256sum] = "0756dd54dab2f2a437e5d4df64b9760c3e6cf6a7d29fb296bdeeeb749f6ea28e"
inherit autotools update-rc.d systemd