packages/syscare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.2.1-8

Browse Source 
syscared: fix apply kernel module patch failure issue

Signed-off-by: ningyu <405888464@qq.com>
(cherry picked from commit ee9a0e3756acb894bd3e0f3db69b4b8d7503132f)
This commit is contained in:
ningyu 2024-05-20 10:40:44 +08:00 committed by openeuler-sync-bot
parent f77b25fea6
commit b3955d5b6a
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0022-syscared-fix-apply-kernel-module-patch-failure-issue.patch Normal file
View File

@ -0,0 +1,27 @@
From cf5217d55b2a603cfa0a852d876809c536835f18 Mon Sep 17 00:00:00 2001
From: renoseven <dev@renoseven.net>
Date: Fri, 17 May 2024 14:46:30 +0800
Subject: [PATCH] syscared: fix 'apply kernel module patch failure' issue
Signed-off-by: renoseven <dev@renoseven.net>
---
syscared/src/patch/driver/kpatch/mod.rs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/syscared/src/patch/driver/kpatch/mod.rs b/syscared/src/patch/driver/kpatch/mod.rs
index 307efb5..970da92 100644
--- a/syscared/src/patch/driver/kpatch/mod.rs
+++ b/syscared/src/patch/driver/kpatch/mod.rs
@@ -128,6 +128,9 @@ impl KernelPatchDriver {
debug!("Patch target: '{}'", patch_target);
debug!("Current kernel: '{}'", current_kernel.to_string_lossy());
+ if !patch_target.starts_with("KERNEL_NAME_PREFIX") {
+ return Ok(());
+ }
ensure!(
current_kernel == patch_target,
"Kpatch: Patch is incompatible",
--
2.41.0

5
syscare.spec
View File

@ -11,7 +11,7 @@
############################################ ############################################
Name: syscare Name: syscare
Version: 1.2.1 Version: 1.2.1
Release: 7 Release: 8
Summary: System hot-fix service Summary: System hot-fix service
License: MulanPSL-2.0 and GPL-2.0-only License: MulanPSL-2.0 and GPL-2.0-only
URL: https://gitee.com/openeuler/syscare URL: https://gitee.com/openeuler/syscare
@ -38,6 +38,7 @@ Patch0018: 0018-upatch-manage-Fixed-the-core-dump-issue-after-applyi.patch
Patch0019: 0019-upatch-diff-fix-lookup_relf-failed-issue.patch Patch0019: 0019-upatch-diff-fix-lookup_relf-failed-issue.patch
Patch0020: 0020-upatch-diff-only-check-changed-file-symbols.patch Patch0020: 0020-upatch-diff-only-check-changed-file-symbols.patch
Patch0021: 0021-upatch-diff-remove-rela-check-while-build-rebuilding.patch Patch0021: 0021-upatch-diff-remove-rela-check-while-build-rebuilding.patch
Patch0022: 0022-syscared-fix-apply-kernel-module-patch-failure-issue.patch
BuildRequires: cmake >= 3.14 make BuildRequires: cmake >= 3.14 make
BuildRequires: rust >= 1.51 cargo >= 1.51 BuildRequires: rust >= 1.51 cargo >= 1.51
@ -187,6 +188,8 @@ fi
################ Change log ################ ################ Change log ################
############################################ ############################################
%changelog %changelog
* Mon May 20 2024 ningyu<ningyu9@huawei.com> - 1.2.1-8
- syscared: fix apply kernel module patch failure issue
* Tue May 14 2024 ningyu<ningyu9@huawei.com> - 1.2.1-7 * Tue May 14 2024 ningyu<ningyu9@huawei.com> - 1.2.1-7
- upatch-diff: remove rela check while build rebuilding .eh_frame - upatch-diff: remove rela check while build rebuilding .eh_frame
- upatch-diff: only check changed file symbols - upatch-diff: only check changed file symbols