!20 [sync] PR-19: 修复在 openEuler-24.03-LTS-everything:loongarch 构建失败
From: @openeuler-sync-bot Reviewed-by: @dowzyx Signed-off-by: @dowzyx
This commit is contained in:
commit
53cd1a6194
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
%define kmod_name sysmonitor
|
%define kmod_name sysmonitor
|
||||||
%define version 1.3.2
|
%define version 1.3.2
|
||||||
%define releaseversion 1.4
|
%define releaseversion 1.5
|
||||||
Summary: System Monitor Daemon
|
Summary: System Monitor Daemon
|
||||||
Name: %{kmod_name}-kmod
|
Name: %{kmod_name}-kmod
|
||||||
Version: %{version}
|
Version: %{version}
|
||||||
@ -37,6 +37,7 @@ Provides: sysmonitor
|
|||||||
|
|
||||||
Patch1: bugfix-fix-signal-monitor-err.patch
|
Patch1: bugfix-fix-signal-monitor-err.patch
|
||||||
Patch2: bugfix-fix-fd-path-failed-to-open.patch
|
Patch2: bugfix-fix-fd-path-failed-to-open.patch
|
||||||
|
Patch3: update-support-loongarch-fix-compilation-errors.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
System Monitor Daemon
|
System Monitor Daemon
|
||||||
@ -171,6 +172,12 @@ systemctl daemon-reload 2>/dev/null 1>/dev/null
|
|||||||
/usr/lib/systemd/system/multi-user.target.wants/sysmonitor.service
|
/usr/lib/systemd/system/multi-user.target.wants/sysmonitor.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 03 2024 yueyuankun <yueyuankun@kylinos.cn> - 1.3.2-1.5
|
||||||
|
- Type:update
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC: support loongarch, fix compilation errors
|
||||||
|
|
||||||
* Thu Apr 11 2024 tenglei <tenglei@kylinos.cn> - 1.3.2-1.4
|
* Thu Apr 11 2024 tenglei <tenglei@kylinos.cn> - 1.3.2-1.4
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
25
update-support-loongarch-fix-compilation-errors.patch
Normal file
25
update-support-loongarch-fix-compilation-errors.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From fb19b25f3723c6274bf0225c0cbd33180e726707 Mon Sep 17 00:00:00 2001
|
||||||
|
From: yueyuankun <yueyuankun@kylinos.cn>
|
||||||
|
Date: Mon, 3 Jun 2024 14:54:20 +0800
|
||||||
|
Subject: [PATCH] support loongarch, fix compilation errors
|
||||||
|
|
||||||
|
---
|
||||||
|
module/signo_catch.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/module/signo_catch.c b/module/signo_catch.c
|
||||||
|
index c038e16..a9270e0 100644
|
||||||
|
--- a/module/signo_catch.c
|
||||||
|
+++ b/module/signo_catch.c
|
||||||
|
@@ -257,7 +257,7 @@ out:
|
||||||
|
|
||||||
|
static int pre_handler(struct kprobe *p, struct pt_regs *regs)
|
||||||
|
{
|
||||||
|
-#ifdef CONFIG_ARM64
|
||||||
|
+#if (defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH))
|
||||||
|
send_sig_info_data_t data;
|
||||||
|
data.sig = regs->regs[0];
|
||||||
|
data.info = (struct kernel_siginfo *)((unsigned long *)regs->regs[1]);
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user