License-Update: Update with current text for GPLv2 [1] * This version has support for riscv64 so enable it in COMPATIBLE_HOSTS * LoongArch support and other fixes * Drop patch already upstream in 2.0.32 release
[1] https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/COPYING?h=main&id=591ebf60649de53dd7a9c916ef4e831626ab1810 Signed-off-by: Khem Raj <[email protected]> --- v2: Upgrade to a version which has RV64 support instead of backporting the patches ...nt-base-match-pinned-section-address.patch | 62 ------------------- ...-tools_2.0.31.bb => kexec-tools_2.0.32.bb} | 8 +-- 2 files changed, 3 insertions(+), 67 deletions(-) delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0001-Make-the-segment-base-match-pinned-section-address.patch rename meta/recipes-kernel/kexec/{kexec-tools_2.0.31.bb => kexec-tools_2.0.32.bb} (92%) diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-Make-the-segment-base-match-pinned-section-address.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-Make-the-segment-base-match-pinned-section-address.patch deleted file mode 100644 index 6babf16e6e..0000000000 --- a/meta/recipes-kernel/kexec/kexec-tools/0001-Make-the-segment-base-match-pinned-section-address.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 0d8a9e12b6509cb2a79818f5f4062a0bee33edfc Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 3 Sep 2025 13:28:32 -0700 -Subject: [PATCH] Make the segment base match pinned section address - -ET_EXEC uses image base of 0x400000, but the build forces -section VMAs like .text = 0x10000. LLD now errors when any -section address is below the image base unless you explicitly -set the base. (Older LLD tolerated it.) - -To fix this, set the image base to match forced section addresses - -Fixes -| x86_64-yoe-linux-ld.lld: error: section '.text' address (0x10000) is smaller than image base (0x400000); specify --image-base -| x86_64-yoe-linux-ld.lld: error: section '.bss' address (0x12000) is smaller than image base (0x400000); specify --image-base - -Upstream-Status: Submitted [https://lists.infradead.org/pipermail/kexec/2025-September/033493.html] - -Signed-off-by: Khem Raj <[email protected]> ---- - kexec_test/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/kexec_test/Makefile -+++ b/kexec_test/Makefile -@@ -5,7 +5,7 @@ RELOC:=0x10000 - KEXEC_TEST_SRCS:= kexec_test/kexec_test16.S kexec_test/kexec_test.S - - dist += kexec_test/Makefile $(KEXEC_TEST_SRCS) \ -- kexec_test/x86-setup-legacy-pic.S -+ kexec_test/x86-setup-legacy-pic.S kexec_test/kexec_test.ld - - BUILD_KEXEC_TEST = no - ifeq ($(ARCH),i386) -@@ -31,7 +31,7 @@ $(KEXEC_TEST): CPPFLAGS+=-DRELOC=$(RELOC - $(KEXEC_TEST): ASFLAGS+=-m32 - #$(KEXEC_TEST): LDFLAGS=-m32 -Wl,-e -Wl,_start -Wl,-Ttext -Wl,$(RELOC) \ - # -nostartfiles --$(KEXEC_TEST): LDFLAGS=-melf_i386 -e _start -Ttext $(RELOC) -+$(KEXEC_TEST): LDFLAGS=-melf_i386 -e _start -T $(srcdir)/kexec_test/kexec_test.ld - - $(KEXEC_TEST): $(KEXEC_TEST_OBJS) - mkdir -p $(@D) ---- /dev/null -+++ b/kexec_test/kexec_test.ld -@@ -0,0 +1,16 @@ -+ENTRY(_start) -+SECTIONS -+{ -+ . = 0x10000; -+ .text : { *(.text .text.*) } -+ -+ /* Place the note after .text to avoid overlap */ -+ . = ALIGN(16); -+ .note.gnu.property : { *(.note.gnu.property) } -+ -+ .rodata : { *(.rodata .rodata.*) } -+ -+ /* If you need bss fixed: */ -+ . = 0x12000; -+ .bss : { *(.bss .bss.* COMMON) } -+} diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.31.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.32.bb similarity index 92% rename from meta/recipes-kernel/kexec/kexec-tools_2.0.31.bb rename to meta/recipes-kernel/kexec/kexec-tools_2.0.32.bb index b12f76a0bf..e052cc5b1b 100644 --- a/meta/recipes-kernel/kexec/kexec-tools_2.0.31.bb +++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.32.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Kexec is a fast reboot feature that lets you reboot to a new Linu HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/"; SECTION = "kernel/userland" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce \ file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09 \ " DEPENDS = "zlib xz" @@ -19,10 +19,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \ file://0001-kexec.c-add-MFD_NOEXEC_SEAL-flag-explicitly.patch \ file://0001-ppc-fs2dt-Match-function-signatures.patch \ - file://0001-Make-the-segment-base-match-pinned-section-address.patch \ " - -SRC_URI[sha256sum] = "ddaaa65b02b4f8aa9222586b1f26565b93a4baeffd35bcbd523f15fae7aa4897" +SRC_URI[sha256sum] = "41c427651269cba7ecb0a3a537403076c5694949783b5cc3ae046223bc962087" inherit autotools update-rc.d systemd @@ -86,7 +84,7 @@ SYSTEMD_SERVICE:kdump = "kdump.service" SECURITY_PIE_CFLAGS:remove = "-fPIE -pie" -COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)' +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*|riscv64.*)-(linux|freebsd.*)' # makedumpfile would not compile on mips/rv32 COMPATIBLE_HOST:mipsarcho32 = "null" COMPATIBLE_HOST:riscv32 = "null"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#227691): https://lists.openembedded.org/g/openembedded-core/message/227691 Mute This Topic: https://lists.openembedded.org/mt/116766540/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
