From 24f9b31080a78d9f6a6c0b9d6aa7a9cc0c1d1903 Mon Sep 17 00:00:00 2001 From: Kairui Song Date: Thu, 21 Mar 2019 11:22:09 +0800 Subject: [PATCH] Release 2.0.19-1 Rebase to latest kexec-tools upstream and remove backport patch. Signed-off-by: Kairui Song --- ...0.18-purgatory-Use-standalond-CFLAGS.patch | 34 ------------------- kexec-tools.spec | 13 ++++--- sources | 2 +- 3 files changed, 9 insertions(+), 40 deletions(-) delete mode 100644 kexec-tools-2.0.18-purgatory-Use-standalond-CFLAGS.patch diff --git a/kexec-tools-2.0.18-purgatory-Use-standalond-CFLAGS.patch b/kexec-tools-2.0.18-purgatory-Use-standalond-CFLAGS.patch deleted file mode 100644 index 9639877..0000000 --- a/kexec-tools-2.0.18-purgatory-Use-standalond-CFLAGS.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c493af72ac796e8ab3f3f4299205bd402dcee861 Mon Sep 17 00:00:00 2001 -From: Kairui Song -Date: Mon, 28 Jan 2019 18:50:40 +0800 -Subject: [PATCH] purgatory: Use standalond CFLAGS - -There has been a lot of workarounds for purgatory disabling many -specified CFLAGS that will break purgatory. It will be better to not -let the CFLAGS used to compile purgatory honor the CFLAGS from -environment variables. So we will have stable CFLAGS for purgatory. - -If anyone still wants to change purgatory CFLAGS, PURGATORY_EXTRA_CFLAGS -is still honored. - -Signed-off-by: Simon Horman ---- - purgatory/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/purgatory/Makefile b/purgatory/Makefile -index 49ce80a..2dd6c47 100644 ---- a/purgatory/Makefile -+++ b/purgatory/Makefile -@@ -45,7 +45,7 @@ purgatory/sha256.o: $(srcdir)/util_lib/sha256.c - $(COMPILE.c) -o $@ $^ - - $(PURGATORY): CC=$(TARGET_CC) --$(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \ -+$(PURGATORY): CFLAGS=$(PURGATORY_EXTRA_CFLAGS) \ - $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ - -Os -fno-builtin -ffreestanding \ - -fno-zero-initialized-in-bss \ --- -2.20.1 - diff --git a/kexec-tools.spec b/kexec-tools.spec index 12a3f96..a1e6686 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -2,8 +2,8 @@ %global eppic_shortver %(c=%{eppic_ver}; echo ${c:0:7}) Name: kexec-tools -Version: 2.0.18 -Release: 5%{?dist} +Version: 2.0.19 +Release: 1%{?dist} License: GPLv2 Summary: The kexec/kdump userspace component @@ -88,8 +88,7 @@ Obsoletes: diskdumputils netdump kexec-tools-eppic # # Patches 601 onward are generic patches # -Patch601: kexec-tools-2.0.18-purgatory-Use-standalond-CFLAGS.patch -Patch602: kexec-tools-2.0.18-makedumpfiles-honor-the-CFLAGS-from-environment.patch +Patch601: kexec-tools-2.0.18-makedumpfiles-honor-the-CFLAGS-from-environment.patch %description kexec-tools provides /sbin/kexec binary that facilitates a new @@ -106,7 +105,6 @@ tar -z -x -v -f %{SOURCE9} tar -z -x -v -f %{SOURCE19} %patch601 -p1 -%patch602 -p1 %ifarch ppc %define archdef ARCH=ppc @@ -329,6 +327,11 @@ done %endif %changelog +* Fri Mar 22 2019 Kairui Song - 2.0.19-1 +- Update eppic to latest snapshot +- fadump: leverage kernel support to re-regisgter FADump +- fadump: use the original initrd to rebuild fadump initrdfrom + * Fri Feb 22 2019 Kairui Song - 2.0.18-5 - Update eppic to latest upstream snapshot - Enable building with hardening flags diff --git a/sources b/sources index e9bb23e..6e740dd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (kexec-tools-2.0.18.tar.xz) = a4142e703a752eb270da29f02ea4fb213f3f4f965e73bb483c388a378821094317a4c63406ab0afe118f79eb168ff63b9d2d9530551c984592165430e269d697 SHA512 (makedumpfile-1.6.5.tar.gz) = bfbf9b373d435857530121f29fb3915cb263cfbaa2b877684a8cde2e8cd8b73fc2f02ffdf9b9108613d42aab7e5653877b092846545ceab865e9909e86145970 SHA512 (eppic-d84c354.tar.gz) = 455b3386c3e4cc546b858f1f8b0e6874072aaae708ebe072452fb5f0b6a81b1f3a315b40f94c3967f38525cadd276864a7bc7f0f12fa421655dcc3b15b70914d +SHA512 (kexec-tools-2.0.19.tar.xz) = 68b15fe46f9633d55c5ae51a6e7114b0c66bd8f4fe81197f581121939a7b21990a2eea89a0961ac6eb7af364ba0d3981ea504df81c7b4cc0b288ca6ac896730f