pool/kexec-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 770156 from Kernel:kdump

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/770156
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kexec-tools?expand=0&rev=133
This commit is contained in:
Dominique Leuenberger 2020-02-09 20:02:41 +00:00 committed by Git OBS Bridge
commit 2184672561
4 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
kexec-tools-SYS_getrandom.patch Normal file
View File

@ -0,0 +1,25 @@
From: Petr Tesarik <ptesarik@suse.com>
Subject: Define SYS_getrandom if needed
Upstream: never, build fix for SLE12
SLE12 did not provide a definition for SYS_getrandom.
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
---
kexec/arch/arm64/kexec-arm64.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/kexec/arch/arm64/kexec-arm64.c
+++ b/kexec/arch/arm64/kexec-arm64.c
@@ -34,6 +34,11 @@
#include "mem_regions.h"
#include "arch/options.h"
+#ifndef __NR_getrandom
+#define __NR_getrandom 278
+__SYSCALL(__NR_getrandom, sys_getrandom)
+#endif
+
#define ROOT_NODE_ADDR_CELLS_DEFAULT 1
#define ROOT_NODE_SIZE_CELLS_DEFAULT 1

25
kexec-tools-video-capability.patch Normal file
View File

@ -0,0 +1,25 @@
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. */

7
kexec-tools.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jan 29 07:35:18 UTC 2020 - Petr Tesařík <ptesarik@suse.com>
- Fix build errors on old distributions
* kexec-tools-video-capability.patch
* kexec-tools-SYS_getrandom.patch
-------------------------------------------------------------------
Fri Jan 10 06:02:42 UTC 2020 - Chester Lin <clin@suse.com>

4
kexec-tools.spec
View File

@ -34,6 +34,8 @@ Patch5: %{name}-add-variant-helper-functions.patch
Patch6: %{name}-arm64-kexec-allocate-memory-space-avoiding-reserved-regions.patch
Patch7: %{name}-arm64-kdump-deal-with-resource-entries-in-proc-iomem.patch
Patch8: %{name}-build-multiboot2-for-i386.patch
Patch9: %{name}-video-capability.patch
Patch10: %{name}-SYS_getrandom.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: systemd-rpm-macros
@ -64,6 +66,8 @@ the loaded kernel after it panics.
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%build
autoreconf -fvi