From d5d37554864802215c75fa3ed609edbbdb7d981d Mon Sep 17 00:00:00 2001 From: "longguang.yue" Date: Tue, 19 Aug 2025 10:16:41 +0800 Subject: [PATCH] kernel.spec: adjust copying x509.genkey to be after mrproper mrproper deletes x509.genkey so default_x509.genkey is always effective rather than uder-defined genkey Signed-off-by: longguang.yue --- kernel.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/kernel.spec b/kernel.spec index 30243bdc..a099fa5c 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 106 %global maintenance_release .0.0 -%global pkg_release .98 +%global pkg_release .99 %global openeuler_lts 1 %global openeuler_major 2403 @@ -414,10 +414,6 @@ Applypatches series.conf %{_builddir}/kernel-%{version}/linux-%{KernelVer} find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null find . -name .gitignore -exec rm -f {} \; >/dev/null -%if 0%{?with_signmodules} - cp %{SOURCE11} certs/. -%endif - %if 0%{?with_source} # Copy directory backup for kernel-source cp -a ../linux-%{KernelVer} ../linux-%{KernelVer}-source @@ -438,6 +434,10 @@ perl -p -i -e "s/^OPENEULER_RELEASE.*/OPENEULER_RELEASE = \"%{release}\"/" Makef ## make linux make mrproper %{_smp_mflags} +%if 0%{?with_signmodules} + cp %{SOURCE11} certs/. +%endif + %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/' @@ -1130,6 +1130,9 @@ fi %endif %changelog +* Tue Wed 20 2025 yuelg - 6.6.0-105.0.0.99 +- adjust copying x509.genkey to be after mrproper + * Tue Aug 19 2025 Li Nan - 6.6.0-106.0.0.98 - !17565 Enhance soft hwpoison handling and injection - !17569 drm/vkms: Fix use after free and double free on init error -- Gitee