rpm/kexec-tools
SHA256
1
0
Fork 0
forked from pool/kexec-tools
Code Pull Requests Activity

Accepting request 645913 from home:ptesarik:branches:Kernel:kdump

Browse Source 
- Bump to version 2.0.18
  Changelog: http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.17..v2.0.18
- Drop patches from upstream git:
  * kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch
- Remove the confusing kdump binary (no longer in upstream).

OBS-URL: https://build.opensuse.org/request/show/645913
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=106
This commit is contained in:
Petr Tesařík 2018-11-01 15:48:51 +00:00 committed by Git OBS Bridge
parent 6971e25c78
commit 85ef0d93fa
6 changed files with 19 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kexec-tools-2.0.17.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:44bb637f7094ca1e175ac1c101cbc10b813500908f03004f13a3d8eb9ee0d336
size 370820

3
kexec-tools-2.0.18.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f020f07341977eb512663e301c2de60c6589e141467c16a8efd58243c0b2b238
size 289816

14
kexec-tools-disable-test.patch
View File

@ -8,14 +8,12 @@ Fedora). Also one less file for usr_merge
Makefile.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Index: kexec-tools-2.0.14/Makefile.in
===================================================================
--- kexec-tools-2.0.14.orig/Makefile.in
+++ kexec-tools-2.0.14/Makefile.in
@@ -178,8 +178,11 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_N
--- a/Makefile.in
+++ b/Makefile.in
@@ -173,8 +173,11 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_N
PGSRCS:=$(foreach s, $(GENERATED_SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s))
MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) $(VMCORE_DMESG_MANPAGE)
MAN_PAGES:=$(KEXEC_MANPAGE) $(VMCORE_DMESG_MANPAGE)
-BINARIES_i386:=$(KEXEC_TEST)
-BINARIES_x86_64:=$(KEXEC_TEST)
+# Dont' build kexec_test
@ -23,6 +21,6 @@ Index: kexec-tools-2.0.14/Makefile.in
+#BINARIES_x86_64:=$(KEXEC_TEST)
+BINARIES_i386:=
+BINARIES_x86_64:=
BINARIES:=$(KEXEC) $(KDUMP) $(VMCORE_DMESG) $(BINARIES_$(ARCH))
BINARIES:=$(KEXEC) $(VMCORE_DMESG) $(BINARIES_$(ARCH))
TARGETS:=$(BINARIES) $(MAN_PAGES)
UNINSTALL_KDUMP = $(sbindir)/kdump

36
kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch
View File

@ -1,36 +0,0 @@
From: Chris Clayton <chris2553@googlemail.com>
Date: Mon, 20 Aug 2018 12:00:31 +0100
Subject: kexec: fix for "Unhandled rela relocation: R_X86_64_PLT32" error
Upstream: merged
Git-commit: b9de21ef51a7ceab7122a707c188602eae22c4ee
In response to a change in binutils, commit b21ebf2fb4c
(x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to
the linux kernel during the 4.16 development cycle and has
since been backported to earlier stable kernel series. The
change results in the failure message in $SUBJECT when
rebooting via kexec.
Fix this by replicating the change in kexec.
Signed-off-by: Chris Clayton <chris2553@googlemail.com>
Acked-by: Baoquan He <bhe@redhat.com>
Tested-by: Bhupesh Sharma <bhsharma@redhat.com>
Acked-by: Bhupesh Sharma <bhsharma@redhat.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
index 7fdde73..db85b44 100644
--- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
+++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
@@ -79,6 +79,7 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr),
goto overflow;
break;
case R_X86_64_PC32:
+ case R_X86_64_PLT32:
*(uint32_t *)location = value - address;
break;
default:

9
kexec-tools.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Nov 1 14:58:41 UTC 2018 - ptesarik@suse.com
- Bump to version 2.0.18
Changelog: http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.17..v2.0.18
- Drop patches from upstream git:
* kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch
- Remove the confusing kdump binary (no longer in upstream).
-------------------------------------------------------------------
Mon Sep 10 14:27:09 UTC 2018 - Alberto Planas Dominguez <aplanas@suse.com>

8
kexec-tools.spec
View File

@ -17,7 +17,7 @@
Name: kexec-tools
Version: 2.0.17
Version: 2.0.18
Release: 0
Summary: Tools for loading replacement kernels into memory
License: GPL-2.0-or-later
@ -31,7 +31,6 @@ Source4: %{name}-rpmlintrc
Patch2: %{name}-xen-balloon-up.patch
Patch3: %{name}-disable-test.patch
Patch14: %{name}-vmcoreinfo-in-xen.patch
Patch15: %{name}-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: systemd-rpm-macros
@ -58,7 +57,6 @@ the loaded kernel after it panics.
%patch2 -p1
%patch3 -p1
%patch14 -p1
%patch15 -p1
%build
autoreconf -fvi
@ -70,7 +68,6 @@ make %{?_smp_mflags}
%install
%make_install
install -c -m 0644 %{SOURCE2} %{buildroot}/%{_mandir}/man8
rm -f %{buildroot}/%{_mandir}/man8/kdump.8
mkdir -p %{buildroot}/%{_sbindir}
install -m 0755 %{SOURCE1} %{buildroot}/%{_sbindir}
mkdir -p %{buildroot}/%{_unitdir}
@ -78,7 +75,6 @@ install -m644 %{SOURCE3} %{buildroot}/%{_unitdir}
ln -s service %{buildroot}%{_sbindir}/rckexec-load
#UsrMerge
mkdir -p %{buildroot}/sbin
ln -s %{_sbindir}/kdump %{buildroot}/sbin
ln -s %{_sbindir}/kexec %{buildroot}/sbin
#EndUsrMerge
@ -103,11 +99,9 @@ ln -s %{_sbindir}/kexec %{buildroot}/sbin
%doc AUTHORS COPYING News TODO doc
%{_mandir}/man*/*
#UsrMerge
/sbin/kdump
/sbin/kexec
#EndUsrMerge
%{_sbindir}/rckexec-load
%{_sbindir}/kdump
%{_sbindir}/kexec
%{_sbindir}/kexec-bootloader
%{_sbindir}/vmcore-dmesg