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

Add a revert patch to fix build error

Browse Source 
Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
This commit is contained in:
ZhangPeng 2025-01-21 19:48:01 +08:00
parent dbc3a8b122
commit 52453d5807
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0024-Revert-x86-config-Remove-CONFIG_-prefix-under-Kconfi.patch Normal file
View File

@ -0,0 +1,35 @@
From 7f3e53a74e15e71f38691f82ee6b77ce7c35cd60 Mon Sep 17 00:00:00 2001
From: ZhangPeng <zhangpeng362@huawei.com>
Date: Tue, 21 Jan 2025 19:40:34 +0800
Subject: [PATCH] Revert "x86/config: Remove 'CONFIG_' prefix under Kconfig
entry HYGON_CSV"
hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IBDFAV
----------------------------------------------------------------------
This reverts commit 280610d6243395b8c3ae138a8f4288ca637ebb32.
Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
---
arch/x86/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 7efe93e4e771..a6bbe6029121 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2075,7 +2075,7 @@ config HYGON_CSV
bool "Hygon secure virtualization CSV support"
default y
depends on CPU_SUP_HYGON && AMD_MEM_ENCRYPT
- select CMA
+ select CONFIG_CMA
help
Hygon CSV integrates secure processor, memory encryption and
memory isolation to provide the ability to protect guest's private
--
2.25.1

7
kernel.spec
View File

@ -42,7 +42,7 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig
%global upstream_sublevel 0
%global devel_release 75
%global maintenance_release .0.0
%global pkg_release .67
%global pkg_release .68
%global openeuler_lts 1
%global openeuler_major 2403
@ -144,6 +144,7 @@ Patch0020: 0020-Revert-kabi-reserve-space-for-uprobes.h.patch
Patch0021: 0021-Revert-kabi-reserve-space-for-internal.h.patch
Patch0022: 0022-Revert-kabi-reserve-space-for-perf_event.h.patch
Patch0023: 0023-Revert-bpf-Add-kabi-reserve-padding-for-uapi-struct-.patch
Patch0024: 0024-Revert-x86-config-Remove-CONFIG_-prefix-under-Kconfi.patch
#BuildRequires:
BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, tar
@ -385,6 +386,7 @@ Applypatches series.conf %{_builddir}/kernel-%{version}/linux-%{KernelVer}
%patch0004 -p1
%endif
%patch0024 -p1
%patch0005 -p1
%patch0006 -p1
%patch0007 -p1
@ -1124,6 +1126,9 @@ fi
%endif
%changelog
* Tue Jan 21 2025 ZhangPeng <zhangpeng362@huawei.com> - 6.6.0-75.0.0.68
- Add a revert patch to fix build error
* Tue Jan 21 2025 ZhangPeng <zhangpeng362@huawei.com> - 6.6.0-75.0.0.67
- !14904 net: renesas: rswitch: avoid use-after-put for a device tree node
- net: renesas: rswitch: avoid use-after-put for a device tree node