From 190249f8a54d82f45c1f380b9f3350acea832a4b Mon Sep 17 00:00:00 2001 From: Zheng Zengkai Date: Thu, 2 Jan 2025 21:59:23 +0800 Subject: [PATCH] kernel.spec: remove the PA VA bits change for 64KB kernel As there is no need to change CONFIG_ARM64_PA_BITS and CONFIG_ARM64_VA_BITS to 52 for 64KB page size kernel. Remove these CONFIG modification. BTW, Remove the redundant package64kb suffix for kernel as well. Signed-off-by: Zheng Zengkai --- kernel.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/kernel.spec b/kernel.spec index 2a3bc79..f4f99d8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -11,7 +11,7 @@ %global upstream_sublevel 0 %global devel_release 248 %global maintenance_release .0.0 -%global pkg_release .150 +%global pkg_release .151 %define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -42,7 +42,7 @@ #default is enabled. You can disable it with --without option %define with_perf %{?_without_perf: 0} %{?!_without_perf: 1} -Name: kernel%{?package64kb} +Name: kernel Version: %{upstream_version}.%{upstream_sublevel} Release: %{devel_release}%{?maintenance_release}%{?pkg_release}%{?extra_release} Summary: Linux Kernel @@ -341,10 +341,6 @@ make mrproper %{_smp_mflags} %if %{with_64kb} sed -i arch/arm64/configs/openeuler_defconfig -e 's/^CONFIG_ARM64_4K_PAGES.*/CONFIG_ARM64_64K_PAGES=y/' -sed -i arch/arm64/configs/openeuler_defconfig -e 's/^CONFIG_ARM64_PA_BITS=.*/CONFIG_ARM64_PA_BITS=52/' -sed -i arch/arm64/configs/openeuler_defconfig -e 's/^CONFIG_ARM64_PA_BITS_.*/CONFIG_ARM64_PA_BITS_52=y/' -sed -i arch/arm64/configs/openeuler_defconfig -e 's/^CONFIG_ARM64_VA_BITS=.*/CONFIG_ARM64_VA_BITS=52/' -sed -i arch/arm64/configs/openeuler_defconfig -e 's/^CONFIG_ARM64_VA_BITS_.*/CONFIG_ARM64_VA_BITS_52=y/' %endif make ARCH=%{Arch} openeuler_defconfig @@ -928,6 +924,9 @@ fi %endif %changelog +* Thu Feb 06 2025 Zheng Zengkai - 5.10.0-248.0.0.151 +- kernel.spec: remove the PA/VA BITS change for 64KB page size kernel + * Thu Feb 06 2025 Zheng Zengkai - 5.10.0-248.0.0.150 - kernel.spec: fix posttrans kernel scriptlet failed for 64KB version