From 23d47b8b0ccdc9e1f9e25798b4104e24862cd0aebb4ff9466058e0bdec401560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Mon, 3 May 2021 11:16:18 +0000 Subject: [PATCH] Accepting request 890015 from home:ptesarik:branches:Kernel:kdump - Bump version to 2.0.21 - Drop patches from upstream git: * kexec-tools-video-capability.patch OBS-URL: https://build.opensuse.org/request/show/890015 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=139 --- kexec-tools-2.0.21.tar.xz | 3 --- kexec-tools-2.0.22.tar.xz | 3 +++ ...-remove-duplicate-ramdisk-definition.patch | 3 ++- kexec-tools-video-capability.patch | 25 ------------------- kexec-tools.changes | 7 ++++++ kexec-tools.spec | 3 +-- 6 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 kexec-tools-2.0.21.tar.xz create mode 100644 kexec-tools-2.0.22.tar.xz delete mode 100644 kexec-tools-video-capability.patch diff --git a/kexec-tools-2.0.21.tar.xz b/kexec-tools-2.0.21.tar.xz deleted file mode 100644 index bf09483..0000000 --- a/kexec-tools-2.0.21.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e113142dee891638ad96e0f72cf9277b244477619470b30c41999d312e8e8702 -size 303300 diff --git a/kexec-tools-2.0.22.tar.xz b/kexec-tools-2.0.22.tar.xz new file mode 100644 index 0000000..00096c2 --- /dev/null +++ b/kexec-tools-2.0.22.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2 +size 303564 diff --git a/kexec-tools-remove-duplicate-ramdisk-definition.patch b/kexec-tools-remove-duplicate-ramdisk-definition.patch index e0be72c..80b77fc 100644 --- a/kexec-tools-remove-duplicate-ramdisk-definition.patch +++ b/kexec-tools-remove-duplicate-ramdisk-definition.patch @@ -1,6 +1,7 @@ From: Petr Tesarik Subject: Remove duplicate definition of ramdisk -Upstream: not yet, sent on 2021-04-26 +Upstream: merged +Git-commit: 5e7ce27626a44428c01e0e5ab3fe60ef98ca788c The ramdisk variable is defined in kexec/arch/ppc/kexec-ppc.c. This other definition is not needed and breaks build with -fno-common. diff --git a/kexec-tools-video-capability.patch b/kexec-tools-video-capability.patch deleted file mode 100644 index bcf090d..0000000 --- a/kexec-tools-video-capability.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Petr Tesarik -Subject: Make sure VIDEO_CAPABILITY_64BIT_BASE is defined -Upstream: never, build fix for SLE12 - -SLE12 did not provide a definition for VIDEO_CAPABILITY_64BIT_BASE -in . - -Signed-off-by: Petr Tesarik ---- - kexec/arch/i386/x86-linux-setup.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/kexec/arch/i386/x86-linux-setup.c -+++ b/kexec/arch/i386/x86-linux-setup.c -@@ -37,6 +37,10 @@ - #include "x86-linux-setup.h" - #include "../../kexec/kexec-syscall.h" - -+#ifndef VIDEO_CAPABILITY_64BIT_BASE -+#define VIDEO_CAPABILITY_64BIT_BASE (1 << 1) /* Frame buffer base is 64-bit */ -+#endif -+ - void init_linux_parameters(struct x86_linux_param_header *real_mode) - { - /* Fill in the values that are usually provided by the kernel. */ diff --git a/kexec-tools.changes b/kexec-tools.changes index 78b9c8a..83b925f 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 3 10:57:35 UTC 2021 - Petr Tesařík + +- Bump version to 2.0.21 +- Drop patches from upstream git: + * kexec-tools-video-capability.patch + ------------------------------------------------------------------- Mon Apr 26 09:35:21 UTC 2021 - Petr Tesařík diff --git a/kexec-tools.spec b/kexec-tools.spec index 370b8e3..31ac46d 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -17,7 +17,7 @@ Name: kexec-tools -Version: 2.0.21 +Version: 2.0.22 Release: 0 Summary: Tools for loading replacement kernels into memory License: GPL-2.0-or-later @@ -29,7 +29,6 @@ Source3: kexec-load.service Source4: %{name}-rpmlintrc Patch3: %{name}-disable-test.patch Patch4: %{name}-vmcoreinfo-in-xen.patch -Patch9: %{name}-video-capability.patch Patch10: %{name}-SYS_getrandom.patch Patch11: %{name}-remove-duplicate-ramdisk-definition.patch BuildRequires: autoconf