From 6b582c88de9291d64d2f322052fd3d8ed830ace0 Mon Sep 17 00:00:00 2001 From: Lianbo Jiang Date: Fri, 17 Nov 2023 15:01:54 +0800 Subject: [PATCH] Rebase to upstream crash-8.0.4 Release: crash-8.0.4-1 Resolves: RHEL-9010 Signed-off-by: Lianbo Jiang --- .gitignore | 1 + ...0.3_build.patch => crash-8.0.4_build.patch | 8 +-- crash.spec | 71 ++----------------- lzo_snappy_zstd.patch | 8 +-- sources | 2 +- 5 files changed, 17 insertions(+), 73 deletions(-) rename crash-8.0.3_build.patch => crash-8.0.4_build.patch (91%) diff --git a/.gitignore b/.gitignore index 284d5c0..cff9673 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ SOURCES/gdb-7.6.tar.gz /crash-7.3.2.tar.gz /gdb-7.6.tar.gz /crash-8.0.3.tar.gz +/crash-8.0.4.tar.gz /gdb-10.2.tar.gz diff --git a/crash-8.0.3_build.patch b/crash-8.0.4_build.patch similarity index 91% rename from crash-8.0.3_build.patch rename to crash-8.0.4_build.patch index bb09e2b..3db6f47 100644 --- a/crash-8.0.3_build.patch +++ b/crash-8.0.4_build.patch @@ -1,5 +1,5 @@ ---- crash-8.0.3/Makefile.orig -+++ crash-8.0.3/Makefile +--- crash-8.0.4/Makefile.orig ++++ crash-8.0.4/Makefile @@ -204,7 +204,7 @@ GDB_FLAGS= # TARGET_CFLAGS will be configured automatically by configure TARGET_CFLAGS= @@ -18,8 +18,8 @@ @echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj @rm -f ${PROGRAM} @if [ ! -f ${GDB}/config.status ]; then \ ---- crash-8.0.3/configure.c.orig -+++ crash-8.0.3/configure.c +--- crash-8.0.4/configure.c.orig ++++ crash-8.0.4/configure.c @@ -810,7 +810,8 @@ build_configure(struct supported_gdb_version *sp) fprintf(fp2, "%s\n", sp->GDB); sprintf(target_data.gdb_version, "%s", &sp->GDB[4]); diff --git a/crash.spec b/crash.spec index 6fa66d1..ed9a9af 100644 --- a/crash.spec +++ b/crash.spec @@ -3,7 +3,7 @@ # Summary: Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles Name: crash -Version: 8.0.3 +Version: 8.0.4 Release: 1%{?dist} License: GPLv3 Group: Development/Debuggers @@ -18,37 +18,7 @@ Requires: binutils Provides: bundled(libiberty) Provides: bundled(gdb) = 10.2 Patch0: lzo_snappy_zstd.patch -Patch1: crash-8.0.3_build.patch -Patch2: 0001-Fix-kernel-version-macros-for-revision-numbers-over-.patch -Patch3: 0002-Fix-failure-of-dev-d-D-options-on-Linux-6.4-and-late.patch -Patch4: 0003-Fix-kmem-v-option-displaying-no-regions-on-Linux-6.3.patch -Patch5: 0004-arm64-x86_64-Enhance-vtop-command-to-show-zero_pfn-i.patch -Patch6: 0005-diskdump-netdump-fix-segmentation-fault-caused-by-fa.patch -Patch7: 0006-Fix-segfault-in-arm64_is_kernel_exception_frame-when.patch -Patch8: 0007-Output-prompt-when-stdin-is-not-a-TTY.patch -Patch9: 0008-x86_64-Fix-bt-command-printing-stale-entries-on-Linu.patch -Patch10: 0009-Fix-invalid-structure-size-error-during-crash-startu.patch -Patch11: 0010-Revert-Fix-segfault-in-arm64_is_kernel_exception_fra.patch -Patch12: 0011-arm64-Fix-again-segfault-in-arm64_is_kernel_exceptio.patch -Patch13: 0012-ppc64-Remove-redundant-PTE-checks.patch -Patch14: 0013-Support-module-memory-layout-change-on-Linux-6.4.patch -Patch15: 0014-Fix-failure-of-gathering-task-table-on-Linux-6.5-rc1.patch -Patch16: 0015-Fix-compilation-error-due-to-new-strlcpy-function-th.patch -Patch17: 0016-Fix-irq-a-option-on-Linux-6.0-and-later.patch -Patch18: 0017-vmware-Improve-output-when-we-fail-to-read-vmware-vm.patch -Patch19: 0018-Exclude-zero-entries-from-do_maple_tree-return-value.patch -Patch20: 0019-Fix-irq-a-s-options-on-Linux-6.5-rc1-and-later.patch -Patch21: 0020-Fix-segmentation-fault-by-tree-s-option-with-Maple-T.patch -Patch22: 0021-Fix-warning-about-kernel-version-inconsistency-durin.patch -Patch23: 0022-Fix-get_linux_banner_from_vmlinux-for-vmlinux-withou.patch -Patch24: 0023-Fix-foreach-command-with-DE-state-to-display-only-ex.patch -Patch25: 0024-Fix-ps-vm-commands-to-display-correct-memory-usage.patch -Patch26: 0025-RISCV64-Use-va_kernel_pa_offset-in-VTOP.patch -Patch27: 0026-Revert-Fix-kmem-s-S-not-working-properly-on-RHEL8.6-.patch -Patch28: 0027-Fix-kmem-s-S-not-working-properly-when-CONFIG_SLAB_F.patch -Patch29: 0028-deduplicate-kernel_version-open-coded-parser.patch -Patch30: 0029-RISCV64-Add-KASLR-support.patch -Patch31: 0030-Fix-ps-vm-commands-to-display-the-memory-usage-for-e.patch +Patch1: crash-8.0.4_build.patch %description The core analysis suite is a self-contained tool that can be used to @@ -69,38 +39,8 @@ offered by Mission Critical Linux, or the LKCD kernel patch. %prep %setup -n %{name}-%{version} -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 +%patch -P 0 -p1 -b lzo_snappy_zstd.patch +%patch -P 1 -p1 -b crash-8.0.4_build.patch %build cp %{SOURCE1} . @@ -128,6 +68,9 @@ rm -rf %{buildroot} %{_includedir}/* %changelog +* Fri Nov 17 2023 Lianbo Jiang - 8.0.4-1 +- Rebase to upstream crash 8.0.4 + * Thu Sep 07 2023 Lianbo Jiang - 8.0.3-1 - Rebase to upstream crash-utility 8.0.3 - Backport the latest patches from upstream crash-utility diff --git a/lzo_snappy_zstd.patch b/lzo_snappy_zstd.patch index 8d50246..67e4ad3 100644 --- a/lzo_snappy_zstd.patch +++ b/lzo_snappy_zstd.patch @@ -1,5 +1,5 @@ ---- crash-8.0.3/Makefile.orig -+++ crash-8.0.3/Makefile +--- crash-8.0.4/Makefile.orig ++++ crash-8.0.4/Makefile @@ -256,7 +256,7 @@ all: make_configure gdb_merge: force @if [ ! -f ${GDB}/README ]; then \ @@ -9,8 +9,8 @@ @echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj @rm -f ${PROGRAM} @if [ ! -f ${GDB}/config.status ]; then \ ---- crash-8.0.3/diskdump.c.orig -+++ crash-8.0.3/diskdump.c +--- crash-8.0.4/diskdump.c.orig ++++ crash-8.0.4/diskdump.c @@ -23,6 +23,9 @@ * GNU General Public License for more details. */ diff --git a/sources b/sources index 29d88c0..5fb4c7b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (crash-8.0.3.tar.gz) = 1ce7fda89274051cea02a049a674f2ca43fc02e00121f951af0d4c23c7b74cc79949ec376bb6737f82b95fec0cbe495b53a09df7e5f1f31ee5a829c1d53d0ba0 +SHA512 (crash-8.0.4.tar.gz) = a08589026515990eee555af6eeba0457433fe41263512ed67dfcac1cf49a8f61dc794081f4984700d8dfed228440a1d7928fdd1f5cf4ae8a45cf39eb49d3470b SHA512 (gdb-10.2.tar.gz) = aa89caf47c1c84366020377d47e7c51ddbc48e5b7686f244e38797c8eb88411cf57fcdc37eb669961efb41ceeac4181747f429625fd1acce7712cb9a1fea9c41