From f76857004eab754f0b415c730cc4e2d3858a87f6 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 01:28:07 +0100 Subject: [PATCH] rebuilt with debug package [release 2.0.20-2mamba;Tue Dec 08 2020] --- README.md | 1 - kexec-tools-2.0.20-arm-buildfix.patch | 11 +++++++++++ kexec-tools.spec | 16 +++++++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 kexec-tools-2.0.20-arm-buildfix.patch diff --git a/README.md b/README.md index 6d0321e..6d9106d 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,5 @@ /sbin/kexec is a user space utility for loading another kernel and asking the currently running kernel to do something with it. A currently running kernel may be asked to start the loaded kernel on reboot, or to start the loaded kernel after it panics. - The panic case is useful for having an intact kernel for writing crash dumps. But other uses may be imagined. diff --git a/kexec-tools-2.0.20-arm-buildfix.patch b/kexec-tools-2.0.20-arm-buildfix.patch new file mode 100644 index 0000000..9d3a1b7 --- /dev/null +++ b/kexec-tools-2.0.20-arm-buildfix.patch @@ -0,0 +1,11 @@ +--- kexec-tools-2.0.20/kexec/arch/arm/kexec-zImage-arm.c.orig 2020-12-10 11:15:37.241691824 +0100 ++++ kexec-tools-2.0.20/kexec/arch/arm/kexec-zImage-arm.c 2020-12-10 11:15:45.637546243 +0100 +@@ -569,7 +569,7 @@ + tag = find_extension_tag(buf, len, ZIMAGE_TAG_KRNL_SIZE); + if (tag) { + uint32_t *p = (void *)buf + le32_to_cpu(tag->u.krnl_size.size_ptr); +- uint32_t edata_size = le32_to_cpu(get_unaligned(p)); ++ uint32_t edata_size = le32_to_cpu(p); + uint32_t bss_size = le32_to_cpu(tag->u.krnl_size.bss_size); + uint32_t kernel_size = edata_size + bss_size; + diff --git a/kexec-tools.spec b/kexec-tools.spec index 69bbd60..f64955b 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -1,6 +1,6 @@ Name: kexec-tools Version: 2.0.20 -Release: 1mamba +Release: 2mamba Summary: Load one kernel from another Group: System/Kernel and Hardware Vendor: openmamba @@ -10,6 +10,7 @@ URL: http://www.kernel.org/pub/linux/utils/kernel/kexec/README.html Source: http://www.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-%{version}.tar.xz Patch0: kexec-tools-2.0.13-arm-missing-files.patch Patch1: kexec-tools-2.0.20-x86-fix.patch +Patch2: kexec-tools-2.0.20-arm-buildfix.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -27,18 +28,24 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root %description /sbin/kexec is a user space utility for loading another kernel and asking the currently running kernel to do something with it. A currently running kernel may be asked to start the loaded kernel on reboot, or to start the loaded kernel after it panics. - The panic case is useful for having an intact kernel for writing crash dumps. But other uses may be imagined. +%debug_package + %prep %setup -q #%patch0 -p1 %ifarch %{ix86} %patch1 -p1 %endif +%ifarch arm +%patch2 -p1 +%endif %build -%configure +%configure \ + CFLAGS="%{optflags} -fcommon" + %make %install @@ -61,6 +68,9 @@ The panic case is useful for having an intact kernel for writing crash dumps. B #TODO %changelog +* Tue Dec 08 2020 Silvan Calarco 2.0.20-2mamba +- rebuilt with debug package + * Fri Sep 06 2019 Automatic Build System 2.0.20-1mamba - automatic version update by autodist