From 42ab621292b8e616e55d0e884c1c44d4cfbf4a8e Mon Sep 17 00:00:00 2001 From: herengui Date: Thu, 10 Aug 2023 17:48:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BE=99=E8=8A=AF=E5=92=8C?= =?UTF-8?q?=E7=94=B3=E5=A8=81=E6=9E=B6=E6=9E=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: herengui (cherry picked from commit 87c261a0384dd6db99e20cc20e04bcc4f71bd101) --- ...-sw_64-support-not-upstream-modified.patch | 27 ++++++++++++++++++ ...ngarch-support-not-upstream-modified.patch | 28 +++++++++++++++++++ crash-trace-command.spec | 8 +++++- 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 1000-add-sw_64-support-not-upstream-modified.patch create mode 100644 1001-add-loongarch-support-not-upstream-modified.patch diff --git a/1000-add-sw_64-support-not-upstream-modified.patch b/1000-add-sw_64-support-not-upstream-modified.patch new file mode 100644 index 0000000..1ca7c20 --- /dev/null +++ b/1000-add-sw_64-support-not-upstream-modified.patch @@ -0,0 +1,27 @@ +From 2f7ac2e08003c42ef13ed001b5344e2ddba36ef2 Mon Sep 17 00:00:00 2001 +From: yangchenguang +Date: Sat, 13 May 2023 16:40:50 +0800 +Subject: [PATCH] Add sw_64 support + +Signed-off-by: yangchenguang +--- + Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Makefile b/Makefile +index 0d35d4f..325822e 100755 +--- a/Makefile ++++ b/Makefile +@@ -30,6 +30,10 @@ ifeq ($(shell arch), aarch64) + TARGET=ARM64 + TARGET_CFLAGS= + endif ++ifeq ($(shell arch), sw_64) ++ TARGET=SW_64 ++ TARGET_CFLAGS= ++endif + + INCDIR=/usr/include/crash + +-- +2.33.0 diff --git a/1001-add-loongarch-support-not-upstream-modified.patch b/1001-add-loongarch-support-not-upstream-modified.patch new file mode 100644 index 0000000..a5764b3 --- /dev/null +++ b/1001-add-loongarch-support-not-upstream-modified.patch @@ -0,0 +1,28 @@ +From 2f7ac2e08003c42ef13ed001b5344e2ddba36ef2 Mon Sep 17 00:00:00 2001 +From: yangchenguang +Date: Sat, 13 May 2023 16:40:50 +0800 +Subject: [PATCH] Add loongarch64 support + +Signed-off-by: yangchenguang +--- + Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Makefile b/Makefile +index 325822e..a148715 100755 +--- a/Makefile ++++ b/Makefile +@@ -34,6 +34,10 @@ ifeq ($(shell arch), sw_64) + TARGET=SW_64 + TARGET_CFLAGS= + endif ++ifeq ($(shell arch), loongarch64) ++ TARGET=LOONGARCH64 ++ TARGET_CFLAGS= ++endif + + INCDIR=/usr/include/crash + +-- +2.33.0 + diff --git a/crash-trace-command.spec b/crash-trace-command.spec index d69f13a..0f8b1c5 100644 --- a/crash-trace-command.spec +++ b/crash-trace-command.spec @@ -1,6 +1,6 @@ Name: crash-trace-command Version: 3.0 -Release: 2 +Release: 3 Summary: Crash utility's trace extension module License: GPLv2 Source: https://github.com/fujitsu/crash-trace/archive/v%{version}/%{name}-%{version}.tar.gz @@ -12,6 +12,9 @@ Requires: trace-cmd crash >= 7.3.0-2 Patch0001: 0001-Makefile-set-DT_SONAME-to-trace.so.patch Patch0002: 0002-Makefile-fix-build-failure-on-aarch64-and-ppc64le.patch +Patch1000: 1000-add-sw_64-support-not-upstream-modified.patch +Patch1001: 1001-add-loongarch-support-not-upstream-modified.patch + %description This package provides a trace extension module for the crash utility, allowing it to read ftrace data from a core dump file. @@ -32,6 +35,9 @@ cp %{_builddir}/crash-trace-%{version}/trace.so %{buildroot}%{_libdir}/crash/ext %doc COPYING %changelog +* Thu Aug 10 2023 herengui - 3.0-3 +- Add support for sw_64 and loongarch64 + * Mon Nov 14 2022 yaoxin - 3.0-2 - Modify invalid Source and URL -- Gitee