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
This commit is contained in:
Petr Tesařík 2021-05-03 11:16:18 +00:00 committed by Git OBS Bridge
parent 2223aa05ad
commit 23d47b8b0c
6 changed files with 13 additions and 31 deletions

View File

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

View File

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

View File

@ -1,6 +1,7 @@
From: Petr Tesarik <ptesarik@suse.com>
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.

View File

@ -1,25 +0,0 @@
From: Petr Tesarik <ptesarik@suse.com>
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 <linux/screen_info.h>.
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
---
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. */

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 3 10:57:35 UTC 2021 - Petr Tesařík <ptesarik@suse.com>
- 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 <ptesarik@suse.com>

View File

@ -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