packages/kexec-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!2 fix bug in kdump service

Browse Source 
Merge pull request !2 from openeuler-basic/dev
This commit is contained in:
openeuler-ci-bot 2019-12-31 18:34:24 +08:00 committed by Gitee
commit ae91cb96fe
2 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kexec-tools.spec
View File

@ -1,6 +1,6 @@
Name: kexec-tools
Version: 2.0.17
Release: 13
Release: 14
License: GPLv2
Summary: The kexec/kdump userspace component
URL: https://www.kernel.org/
@ -82,7 +82,6 @@ Patch9002: arm64-support-more-than-one-crash-kernel-regions.patch
%endif
Patch9003: makedumpfile-modify-SECTIONS_SIZE_BITS-to-27-for-arm.patch
Patch9004: add-secure-compile-options-for-makedumpfile.patch
%description
kexec-tools provides /sbin/kexec binary that facilitates a new
@ -121,7 +120,6 @@ tar -z -x -v -f %{SOURCE19}
%endif
%patch9003 -p1
%patch9004 -p1
%build
autoreconf
@ -205,6 +203,7 @@ cp %{SOURCE108} %{buildroot}/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdum
cp %{SOURCE109} %{buildroot}/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_early_kdump_prefix %{SOURCE109}}
chmod 755 %{buildroot}/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_prefix %{SOURCE108}}
chmod 755 %{buildroot}/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_early_kdump_prefix %{SOURCE109}}
chmod 755 %{buildroot}/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE103}}
%define dracutlibdir %{_prefix}/lib/dracut
# For custom dracut modules
@ -302,6 +301,13 @@ done
%endif
%changelog
* Tue Dec 31 2019 Jialong Chen <chenjialong@huawei.com> - 2.0.17-14
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:modify SECTION_SIZE_BITS to 30 and keep the same as the kernel configuration.
add executable permissions for kdump-error-handler.sh.
* Thu Dec 19 2019 chengquan <chengquan3@huawei.com> - 2.0.17-13
- Type:enhancement
- ID:NA

28
makedumpfile-modify-SECTIONS_SIZE_BITS-to-27-for-arm.patch
View File

@ -1,28 +0,0 @@
From 2aa3a429d035e9549b25efe06b06503d60a845c8 Mon Sep 17 00:00:00 2001
From: YunFeng Ye <yeyunfeng@huawei.com>
Date: Thu, 4 Jul 2019 00:05:35 +0800
Subject: [PATCH] kexec-tools: modify SECTIONS_SIZE_BITS to 27 for arm64
reason: modify SECTIONS_SIZE_BITS to 27 for arm64
Signed-off-by: YunFeng Ye <yeyunfeng@huawei.com>
---
arch/arm64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64.c b/arch/arm64.c
index 2fd3e18..749ff2e 100644
--- a/makedumpfile-1.6.4/arch/arm64.c
+++ b/makedumpfile-1.6.4/arch/arm64.c
@@ -73,7 +73,7 @@ static unsigned long kimage_voffset;
#define PTRS_PER_PMD PTRS_PER_PTE
#define PAGE_PRESENT (1 << 0)
-#define SECTIONS_SIZE_BITS 30
+#define SECTIONS_SIZE_BITS 27
/* Highest possible physical address supported */
#define PHYS_MASK_SHIFT 48
#define PHYS_MASK ((1UL << PHYS_MASK_SHIFT) - 1)
--
1.8.3.1