From 85ef0d93fa60392503dd5307a0d77741e5de84265ff300e98007431531681d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Thu, 1 Nov 2018 15:48:51 +0000 Subject: [PATCH 1/2] Accepting request 645913 from home:ptesarik:branches:Kernel:kdump - 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 --- kexec-tools-2.0.17.tar.xz | 3 -- kexec-tools-2.0.18.tar.xz | 3 ++ kexec-tools-disable-test.patch | 14 ++++---- ...ndled-rela-relocation-R_X86_64_PLT32.patch | 36 ------------------- kexec-tools.changes | 9 +++++ kexec-tools.spec | 8 +---- 6 files changed, 19 insertions(+), 54 deletions(-) delete mode 100644 kexec-tools-2.0.17.tar.xz create mode 100644 kexec-tools-2.0.18.tar.xz delete mode 100644 kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch diff --git a/kexec-tools-2.0.17.tar.xz b/kexec-tools-2.0.17.tar.xz deleted file mode 100644 index 821683b..0000000 --- a/kexec-tools-2.0.17.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44bb637f7094ca1e175ac1c101cbc10b813500908f03004f13a3d8eb9ee0d336 -size 370820 diff --git a/kexec-tools-2.0.18.tar.xz b/kexec-tools-2.0.18.tar.xz new file mode 100644 index 0000000..0859791 --- /dev/null +++ b/kexec-tools-2.0.18.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f020f07341977eb512663e301c2de60c6589e141467c16a8efd58243c0b2b238 +size 289816 diff --git a/kexec-tools-disable-test.patch b/kexec-tools-disable-test.patch index 428de59..23a3699 100644 --- a/kexec-tools-disable-test.patch +++ b/kexec-tools-disable-test.patch @@ -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 diff --git a/kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch b/kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch deleted file mode 100644 index 0e91e45..0000000 --- a/kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Chris Clayton -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 -Acked-by: Baoquan He -Tested-by: Bhupesh Sharma -Acked-by: Bhupesh Sharma -Signed-off-by: Simon Horman ---- - 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: diff --git a/kexec-tools.changes b/kexec-tools.changes index 94c9f84..cc0980a 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -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 diff --git a/kexec-tools.spec b/kexec-tools.spec index 548ddd2..0710e3b 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -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 From 73ab0227003adfbc83bfdae9d65aa1b5095483b8513f6409e6e9081cd1f28fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Thu, 1 Nov 2018 20:59:27 +0000 Subject: [PATCH 2/2] - Remove bogus Url RPM tag: The project does not have a home page. OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=107 --- kexec-tools.changes | 5 +++++ kexec-tools.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kexec-tools.changes b/kexec-tools.changes index cc0980a..badfbee 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 1 20:58:20 UTC 2018 - ptesarik@suse.com + +- Remove bogus Url RPM tag: The project does not have a home page. + ------------------------------------------------------------------- Thu Nov 1 14:58:41 UTC 2018 - ptesarik@suse.com diff --git a/kexec-tools.spec b/kexec-tools.spec index 0710e3b..c6335dd 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -22,8 +22,7 @@ Release: 0 Summary: Tools for loading replacement kernels into memory License: GPL-2.0-or-later Group: System/Kernel -Url: https://www.kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz -Source: https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/snapshot/%{name}-%{version}.tar.xz +Source: https://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz Source1: kexec-bootloader Source2: kexec-bootloader.8 Source3: kexec-load.service