Accepting request 1174367 from home:simonlm:branches:Kernel:kdump
Update to version 1.7.5 OBS-URL: https://build.opensuse.org/request/show/1174367 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/makedumpfile?expand=0&rev=176
This commit is contained in:
Petr Tesařík
Git OBS Bridge
parent
7717e0b0d7
commit
5431c0c53b
BIN
makedumpfile-1.7.4.tar.gz
(Stored with Git LFS)
BIN
makedumpfile-1.7.4.tar.gz
(Stored with Git LFS)
Binary file not shown.
3
makedumpfile-1.7.5.tar.gz
Normal file
3
makedumpfile-1.7.5.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0c53f1e5e11e75e4896197df795bee63b3d46b8821fbc3368f7a240861b543b5
|
||||
size 210893
|
||||
@ -5,18 +5,10 @@ Upstream: never, SUSE-specific
|
||||
|
||||
SLE 15 SP1 backported commit c2b4d8b7417a ("powerpc/mm/hash64: Increase
|
||||
the VA range"), to Linux 4.12, so let's check SUSE_PRODUCT_CODE.
|
||||
|
||||
Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
|
||||
---
|
||||
arch/ppc64.c | 3 ++-
|
||||
makedumpfile.c | 4 ++++
|
||||
makedumpfile.h | 3 +++
|
||||
3 files changed, 9 insertions(+), 1 deletion(-)
|
||||
Index: makedumpfile-1.7.1/arch/ppc64.c
|
||||
===================================================================
|
||||
--- makedumpfile-1.7.1.orig/arch/ppc64.c
|
||||
+++ makedumpfile-1.7.1/arch/ppc64.c
|
||||
@@ -248,7 +248,9 @@ ppc64_vmalloc_init(void)
|
||||
diff -uprN makedumpfile-1.7.5.orig/arch/ppc64.c makedumpfile-1.7.5/arch/ppc64.c
|
||||
--- makedumpfile-1.7.5.orig/arch/ppc64.c 2024-04-12 13:09:09.000000000 +0800
|
||||
+++ makedumpfile-1.7.5/arch/ppc64.c 2024-05-16 14:19:46.846209221 +0800
|
||||
@@ -261,7 +261,9 @@ ppc64_vmalloc_init(void)
|
||||
|
||||
if (info->kernel_version >= KERNEL_VERSION(4, 12, 0)) {
|
||||
info->l2_index_size = PMD_INDEX_SIZE_L4_64K_4_12;
|
||||
@ -27,39 +19,35 @@ Index: makedumpfile-1.7.1/arch/ppc64.c
|
||||
info->l3_index_size = PUD_INDEX_SIZE_L4_64K_4_17;
|
||||
else
|
||||
info->l3_index_size = PUD_INDEX_SIZE_L4_64K_4_12;
|
||||
Index: makedumpfile-1.7.1/makedumpfile.c
|
||||
===================================================================
|
||||
--- makedumpfile-1.7.1.orig/makedumpfile.c
|
||||
+++ makedumpfile-1.7.1/makedumpfile.c
|
||||
@@ -2491,6 +2491,8 @@ write_vmcoreinfo_data(void)
|
||||
diff -uprN makedumpfile-1.7.5.orig/makedumpfile.c makedumpfile-1.7.5/makedumpfile.c
|
||||
--- makedumpfile-1.7.5.orig/makedumpfile.c 2024-04-12 13:09:09.000000000 +0800
|
||||
+++ makedumpfile-1.7.5/makedumpfile.c 2024-05-16 14:16:42.897988141 +0800
|
||||
@@ -2531,6 +2531,7 @@ write_vmcoreinfo_data(void)
|
||||
WRITE_NUMBER_UNSIGNED("PHYS_OFFSET", PHYS_OFFSET);
|
||||
WRITE_NUMBER_UNSIGNED("kimage_voffset", kimage_voffset);
|
||||
#endif
|
||||
+ WRITE_NUMBER("SUSE_PRODUCT_CODE", SUSE_PRODUCT_CODE);
|
||||
|
||||
+ WRITE_NUMBER("SUSE_PRODUCT_CODE", SUSE_PRODUCT_CODE);
|
||||
+
|
||||
if (info->phys_base)
|
||||
fprintf(info->file_vmcoreinfo, "%s%lu\n", STR_NUMBER("phys_base"),
|
||||
info->phys_base);
|
||||
@@ -2939,6 +2941,8 @@ read_vmcoreinfo(void)
|
||||
@@ -3002,6 +3003,7 @@ read_vmcoreinfo(void)
|
||||
|
||||
READ_NUMBER("HUGETLB_PAGE_DTOR", HUGETLB_PAGE_DTOR);
|
||||
|
||||
READ_NUMBER("RADIX_MMU", RADIX_MMU);
|
||||
+ READ_NUMBER("SUSE_PRODUCT_CODE", SUSE_PRODUCT_CODE);
|
||||
+
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
Index: makedumpfile-1.7.1/makedumpfile.h
|
||||
===================================================================
|
||||
--- makedumpfile-1.7.1.orig/makedumpfile.h
|
||||
+++ makedumpfile-1.7.1/makedumpfile.h
|
||||
@@ -2069,6 +2069,9 @@ struct number_table {
|
||||
unsigned long kernel_link_addr;
|
||||
diff -uprN makedumpfile-1.7.5.orig/makedumpfile.h makedumpfile-1.7.5/makedumpfile.h
|
||||
--- makedumpfile-1.7.5.orig/makedumpfile.h 2024-04-12 13:09:09.000000000 +0800
|
||||
+++ makedumpfile-1.7.5/makedumpfile.h 2024-05-16 14:18:08.275376258 +0800
|
||||
@@ -2283,6 +2283,9 @@ struct number_table {
|
||||
unsigned long va_kernel_pa_offset;
|
||||
#endif
|
||||
+
|
||||
|
||||
+ /* Distro-specific */
|
||||
+ long SUSE_PRODUCT_CODE;
|
||||
+
|
||||
unsigned long RADIX_MMU;
|
||||
};
|
||||
|
||||
struct srcfile_table {
|
||||
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 14 07:21:57 UTC 2024 - ming li <mli@suse.com>
|
||||
|
||||
- Update to 1.7.5:
|
||||
* Support for kernels up to v6.8 (x86_64)
|
||||
* Support for printk caller_id by --dump-dmesg option
|
||||
* [PATCH] ppc64: get vmalloc start address from vmcoreinfo
|
||||
* [PATCH] ppc64: read cur_mmu_type from vmcoreinfo
|
||||
* [PATCH] add PRINTK_CALLER id support to --dump-dmesg option
|
||||
* [PATCH v2 2/2] s390x: uncouple virtual and physical address spaces
|
||||
* [PATCH 1/2] s390x: fix virtual vs physical address confusion
|
||||
|
||||
Regenerated the content of the makedumpfile-ppc64-VA-range-SUSE.patch
|
||||
file based on version 1.7.5 of the code
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 15 14:00:28 UTC 2023 - Petr Tesařík <petr@tesarici.cz>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package makedumpfile
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -28,7 +28,7 @@
|
||||
%endif
|
||||
|
||||
Name: makedumpfile
|
||||
Version: 1.7.4
|
||||
Version: 1.7.5
|
||||
Release: 0
|
||||
Summary: Partial kernel dump
|
||||
License: GPL-2.0-only
|
||||
@ -71,6 +71,8 @@ via gdb or crash utility.
|
||||
%autosetup -p1
|
||||
%endif
|
||||
|
||||
%check
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags} -fcommon"
|
||||
export USESNAPPY=on
|
||||
|
||||
Loading…
Reference in New Issue
Block a user