diff --git a/kernel.spec b/kernel.spec index 50c862099d4e259475fff82093c48e8252324ecf..4228aa6966a1b38be5a4a19c1e0bb6b355bd73c3 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 .112 +%global pkg_release .113 %global openeuler_lts 1 %global openeuler_major 2403 @@ -384,10 +384,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 @@ -408,6 +404,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/' %endif @@ -1138,6 +1138,9 @@ fi %endif %changelog +* Tue Wed 20 2025 yuelg - 6.6.0-104.0.0.113 +- adjust copying x509.genkey to be after mrproper + * Tue Aug 19 2025 Li Nan - 6.6.0-106.0.0.112 - !17565 Enhance soft hwpoison handling and injection - !17569 drm/vkms: Fix use after free and double free on init error