From 68bbeabc909e3413cdcaa2042da70fd2cab5eba5 Mon Sep 17 00:00:00 2001 From: wangxiao65 Date: Fri, 13 Jun 2025 09:56:37 +0800 Subject: [PATCH] use patch command to apply patches for consistency in context (cherry picked from commit 09d2edad660dad47bc8fd641dd2e2822a4bcabad) --- crash.spec | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/crash.spec b/crash.spec index 6ba8a7a..e61333a 100644 --- a/crash.spec +++ b/crash.spec @@ -1,6 +1,6 @@ Name: crash Version: 8.0.4 -Release: 14 +Release: 15 Summary: Linux kernel crash utility. License: GPLv3 URL: https://crash-utility.github.io @@ -9,18 +9,13 @@ Source1: http://ftp.gnu.org/gnu/gdb/gdb-10.2.tar.gz Patch0: 0000-lzo_snappy.patch Patch1: 0001-add-SDEI-stack-resolution.patch -%ifarch sw_64 Patch2: 0002-crash-8.0.4-sw64.patch -%else -%ifarch loongarch64 Patch3: 0003-crash-8.0.4-add-support-for-loongarch64.patch Patch4: 0004-support-vmp_area_list-replaced-with-VMALLOC_START.patch -%endif Patch5: 0005-gdb-ignore-Wenum-constexpr-conversion-in-enum-flags.patch Patch6: 0006-arm64-fix-a-potential-segfault-when-unwind-frame.patch Patch7: 0007-arm64-fix-SDEI-stack-frame-unwind-while-UNW_4_14-is-.patch Patch8: 0008-Fix-segmentation-fault-in-value_search_module_6_4.patch -%endif Patch9001: huawei-fix-ps-error-when-mm_struct.rss_stat-is-lazy-initial.patch BuildRequires: ncurses-devel zlib-devel lzo-devel snappy-devel texinfo libzstd-devel @@ -52,21 +47,25 @@ created by manufacturer-specific firmware. %package_help %prep -%ifarch sw_64 -%autosetup -n %{name}-%{version} -p1 -%else %setup -n %{name}-%{version} %patch 0 -p1 %patch 1 -p1 +%ifarch sw_64 +%patch 2 -p1 +%endif + %ifarch loongarch64 %patch 3 -p1 %patch 4 -p1 %endif -%autopatch -m5 -p1 -%endif +%patch 5 -p1 +%patch 6 -p1 +%patch 7 -p1 +%patch 8 -p1 +%patch 9001 -p1 %build cp %{SOURCE1} . @@ -101,6 +100,10 @@ install -D -m 0644 defs.h %{buildroot}%{_includedir}/%{name}/defs.h %{_mandir}/man8/crash.8* %changelog +* Fri Jun 13 2025 wangxiao - 8.0.4-15 +- remove the arch judgment, include all patches in the src package +- use patch command to apply patches for consistency in context + * Wed May 21 2025 Ming Wang - 8.0.4-14 - Set the NR_CPUS macro in the crash tool to 2048 to match the kernel's value -- Gitee