From 5c98947f120dcd2c4c02ec57cd792e895414f008 Mon Sep 17 00:00:00 2001 From: zhangxianting Date: Mon, 13 May 2024 18:31:27 +0800 Subject: [PATCH] fix prep error of patch --- kernel-rt.spec | 5 ++++- kernel.spec | 5 ++++- ...6.0.0-rt20.patch-openeuler_defconfig.patch | 20 +++++++++---------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/kernel-rt.spec b/kernel-rt.spec index 4d314d24..61579cca 100644 --- a/kernel-rt.spec +++ b/kernel-rt.spec @@ -42,7 +42,7 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig %global upstream_sublevel 0 %global devel_release 25 %global maintenance_release .0.0 -%global pkg_release .1 +%global pkg_release .2 %global rt_release .rt20 %define with_debuginfo 1 @@ -1057,6 +1057,9 @@ fi %endif %changelog +* Mon May 13 2024 zhangxianting - 6.6.0-25.0.0.2 +- fix prep error of patch + * Mon May 10 2024 zhangyu - 6.6.0-25.0.0.1 - update kernel-rt version to 6.6.0-25.0.0.1 diff --git a/kernel.spec b/kernel.spec index 7c2847be..d06d9099 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig %global upstream_sublevel 0 %global devel_release 26 %global maintenance_release .0.0 -%global pkg_release .30 +%global pkg_release .31 %define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -1059,6 +1059,9 @@ fi %endif %changelog +* Mon May 13 2024 zhangxianting - 6.6.0-26.0.0.31 +- fix prep error of patch at kernel-rt + * Sat May 11 2024 ZhangPeng - 6.6.0-26.0.0.30 - !7198 v2 mm: prepare more high-order pages on pcplist - mm: prepare more high-order pages to be stored on the per-cpu lists diff --git a/patch-6.6.0-6.0.0-rt20.patch-openeuler_defconfig.patch b/patch-6.6.0-6.0.0-rt20.patch-openeuler_defconfig.patch index 271c6d37..14bb6c1d 100644 --- a/patch-6.6.0-6.0.0-rt20.patch-openeuler_defconfig.patch +++ b/patch-6.6.0-6.0.0-rt20.patch-openeuler_defconfig.patch @@ -9,32 +9,32 @@ Subject: [PATCH 2/2] rt1 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig -index baf9159c9..8d4709cc0 100644 +index 4932a6be9..24873c5be 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -97,7 +97,7 @@ CONFIG_PREEMPT_NONE=y + # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_DYNAMIC is not set - # CONFIG_SCHED_CORE is not set - +CONFIG_PREEMPT_RT=y # # CPU/Task time and stats accounting # -@@ -749,7 +749,7 @@ CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y - CONFIG_KVM_HISI_VIRT=y +@@ -754,7 +754,7 @@ CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y + CONFIG_KVM_HISI_VIRT=y -CONFIG_VIRTUALIZATION=y +#CONFIG_VIRTUALIZATION is not set CONFIG_KVM=y - CONFIG_KVM_ARM_MULTI_LPI_TRANSLATE_CACHE=y # CONFIG_NVHE_EL2_DEBUG is not set + CONFIG_KVM_ARM_MULTI_LPI_TRANSLATE_CACHE=y diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig -index e68707028..c20a4c0c4 100644 +index 9b5df8585..ece62e3df 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig -@@ -110,11 +110,11 @@ CONFIG_BPF_SCHED=y +@@ -112,11 +112,11 @@ CONFIG_BPF_SCHED=y # end of BPF subsystem CONFIG_PREEMPT_NONE_BUILD=y @@ -48,7 +48,7 @@ index e68707028..c20a4c0c4 100644 # # CPU/Task time and stats accounting # -@@ -245,7 +245,7 @@ CONFIG_SYSCTL=y +@@ -248,7 +248,7 @@ CONFIG_SYSCTL=y CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y @@ -57,7 +57,7 @@ index e68707028..c20a4c0c4 100644 CONFIG_UID16=y CONFIG_MULTIUSER=y CONFIG_SGETMASK_SYSCALL=y -@@ -740,7 +740,7 @@ CONFIG_HAVE_KVM_NO_POLL=y +@@ -744,7 +744,7 @@ CONFIG_HAVE_KVM_NO_POLL=y CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_HAVE_KVM_PM_NOTIFIER=y CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y @@ -67,5 +67,5 @@ index e68707028..c20a4c0c4 100644 CONFIG_KVM_INTEL=m CONFIG_X86_SGX_KVM=y -- -2.41.0 +2.43.0 -- Gitee