From 7c31c12997894d78da94c9f3a62d6f24b548ce82 Mon Sep 17 00:00:00 2001 From: Lichen Liu Date: Tue, 13 Aug 2024 10:05:28 +0800 Subject: [PATCH] Release 2.0.29-1 Resolves: RHEL-54047 Upstream: Fedora Conflict: None Signed-off-by: Lichen Liu --- ...uilding-on-x86_64-with-binutils-2.41.patch | 92 ------------------- ...xec-don-t-use-kexec_file_load-on-XEN.patch | 60 ------------ kexec-tools.spec | 18 ++-- sources | 5 +- 4 files changed, 7 insertions(+), 168 deletions(-) delete mode 100644 kexec-tools-2.0.28-Fix-building-on-x86_64-with-binutils-2.41.patch delete mode 100644 kexec-tools-2.0.28-kexec-don-t-use-kexec_file_load-on-XEN.patch diff --git a/kexec-tools-2.0.28-Fix-building-on-x86_64-with-binutils-2.41.patch b/kexec-tools-2.0.28-Fix-building-on-x86_64-with-binutils-2.41.patch deleted file mode 100644 index 60b15f3..0000000 --- a/kexec-tools-2.0.28-Fix-building-on-x86_64-with-binutils-2.41.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 328de8e00e298f00d7ba6b25dc3950147e9642e6 Mon Sep 17 00:00:00 2001 -From: Michel Lind -Date: Tue, 30 Jan 2024 04:14:31 -0600 -Subject: [PATCH 2/2] 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 -Signed-off-by: Simon Horman ---- - 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.43.0 - diff --git a/kexec-tools-2.0.28-kexec-don-t-use-kexec_file_load-on-XEN.patch b/kexec-tools-2.0.28-kexec-don-t-use-kexec_file_load-on-XEN.patch deleted file mode 100644 index 2af234b..0000000 --- a/kexec-tools-2.0.28-kexec-don-t-use-kexec_file_load-on-XEN.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 94fbe64fb22d61726ca0c0996987574b6c783c19 Mon Sep 17 00:00:00 2001 -From: Jiri Bohac -Date: Tue, 16 Jan 2024 18:14:31 +0100 -Subject: [PATCH 1/2] kexec: don't use kexec_file_load on XEN - -Since commit 29fe5067ed07 ("kexec: make -a the default") -kexec tries the kexec_file_load syscall first and only falls back to kexec_load on -selected error codes. - -This effectively breaks kexec on XEN, unless -c is pecified to force the kexec_load -syscall. - -The XEN-specific functions (xen_kexec_load / xen_kexec_unload) are only called -from my_load / k_unload, i.e. the kexec_load code path. - -With -p (panic kernel) kexec_file_load on XEN fails with -EADDRNOTAVAIL (crash -kernel reservation is ignored by the kernel on XEN), which is not in the list -of return codes that cause the fallback to kexec_file. - -Without -p kexec_file_load actualy leads to a kernel oops on v6.4.0 -(needs to be dubugged separately). - -Signed-off-by: Jiri Bohac -Fixes: 29fe5067ed07 ("kexec: make -a the default") -Signed-off-by: Simon Horman ---- - kexec/kexec.8 | 1 + - kexec/kexec.c | 4 ++++ - 2 files changed, 5 insertions(+) - -diff --git a/kexec/kexec.8 b/kexec/kexec.8 -index b969cea..9e995fe 100644 ---- a/kexec/kexec.8 -+++ b/kexec/kexec.8 -@@ -162,6 +162,7 @@ Specify that the new kernel is of this - .TP - .BI \-s\ (\-\-kexec-file-syscall) - Specify that the new KEXEC_FILE_LOAD syscall should be used exclusively. -+Ignored on XEN. - .TP - .BI \-c\ (\-\-kexec-syscall) - Specify that the old KEXEC_LOAD syscall should be used exclusively. -diff --git a/kexec/kexec.c b/kexec/kexec.c -index 08edfca..9d0ec46 100644 ---- a/kexec/kexec.c -+++ b/kexec/kexec.c -@@ -1685,6 +1685,10 @@ int main(int argc, char *argv[]) - } - } - } -+ if (xen_present()) { -+ do_kexec_file_syscall = 0; -+ do_kexec_fallback = 0; -+ } - if (do_kexec_file_syscall) { - if (do_load_jump_back_helper && !do_kexec_fallback) - die("--load-jump-back-helper not supported with kexec_file_load\n"); --- -2.43.0 - diff --git a/kexec-tools.spec b/kexec-tools.spec index 834172a..2c4351d 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -1,11 +1,11 @@ Name: kexec-tools -Version: 2.0.28 -Release: 15%{?dist} +Version: 2.0.29 +Release: 1%{?dist} URL: https://kernel.org/pub/linux/utils/kernel/kexec License: GPL-2.0-only Summary: The kexec/kdump userspace component -Source0: http://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz +Source0: https://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz Recommends: kdump-utils BuildRequires: automake @@ -24,9 +24,6 @@ BuildRequires: zlib-devel # # Patches 101 through 200 are meant for x86_64 kexec-tools enablement # -# Fix building on x86_64 with binutils 2.41 -# Author: Michel Lind -Patch101: kexec-tools-2.0.28-Fix-building-on-x86_64-with-binutils-2.41.patch # # Patches 301 through 400 are meant for ppc64 kexec-tools enablement @@ -43,9 +40,6 @@ Patch101: kexec-tools-2.0.28-Fix-building-on-x86_64-with-binutils-2.41.patch # # Patches 601 onward are generic patches # -# kexec: don't use kexec_file_load on XEN -# Author: Jiri Bohac -Patch601: kexec-tools-2.0.28-kexec-don-t-use-kexec_file_load-on-XEN.patch %description kexec-tools provides /sbin/kexec binary that facilitates a new @@ -59,9 +53,6 @@ component of the kernel's kexec feature. mkdir -p -m755 kcp -%patch 101 -p1 -%patch 601 -p1 - %ifarch ppc %define archdef ARCH=ppc %endif @@ -96,6 +87,9 @@ rm -f %{buildroot}/%{_libdir}/kexec-tools/kexec_test %doc TODO %changelog +* Tue Aug 13 2024 Lichen Liu - 2.0.29-1 +- Update to 2.0.29 + * Thu Jul 18 2024 Lichen Liu - 2.0.28-15 - Resolves: RHEL-49401 diff --git a/sources b/sources index 5fc0aed..04b13c6 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -SHA512 (kexec-tools-2.0.28.tar.xz) = 889a7bf1d26bb309e4ff7ce1c8dbcf48c01e47221ea3acf1c4ef2a98a652c496e31bddcdb627d3adebd85f7541d1fb9122c60e741e10b3726e31a9733cadc753 -SHA512 (eppic-e8844d3.tar.gz) = d86b9f90c57e694107272d8f71b87f66a30743b9530480fb6f665026bbada4c6b0205a83e40b5383663a945681cfbfcf1ee79469fc219ddf679473c4b2290763 -SHA512 (makedumpfile-1.7.4.tar.gz) = 6c3455b711bd4e120173ee07fcc5ff708ae6d34eaee0f4c135eca7ee0e0475b4d391429c23cf68e848b156ee3edeab956e693a390d67ccc634c43224c7129a96 -SHA512 (kdump-utils-1.0.42.tar.gz) = 2d8717a010bfbffd4410ef57ade1402316cda07faa1063631b8665ac273fac618bff0afd9bdc02292c859d956790e06a51d81b141db158957ef97eb8408111c4 +SHA512 (kexec-tools-2.0.29.tar.xz) = 4c9e0b3df47b240f0eac2c31e8b515465f626ce043f64daa32b0b032d7132e54dada5d70875dab256345f66cf94a25dc3c160a9009ba60addd8dcb1e5205f5ca