From 1059d00409f9d8f4456c9262ddda4c82d586877d Mon Sep 17 00:00:00 2001 From: "longguang.yue" Date: Tue, 19 Aug 2025 15:34:50 +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 5504d472..a43e904d 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 104 %global maintenance_release .0.0 -%global pkg_release .110 +%global pkg_release .111 %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 Aug 19 2025 yuelg - 6.6.0-104.0.0.111 +- adjust copying x509.genkey to be after mrproper + * Wed Aug 06 2025 Li Nan - 6.6.0-104.0.0.110 - !17385 mptcp: pm: only set fullmesh for subflow endp - !17445 xdp: Reset bpf_redirect_info before running a xdp's BPF prog. -- Gitee