From 177ef56316c97bb75312cafe497592e6a266cf0b Mon Sep 17 00:00:00 2001 From: "longguang.yue" Date: Tue, 12 Aug 2025 10:33:24 +0800 Subject: [PATCH] kernel.spec: adjust copying x509.genkey to be after mrproper mrproper deletes x509.genkey and make default_x509.genkey effective Signed-off-by: longguang.yue --- kernel.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/kernel.spec b/kernel.spec index eb4c96ab..c3acfa39 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 33 %global devel_release 0 %global maintenance_release .0.0 -%global pkg_release .1 +%global pkg_release .2 %global openeuler_lts 0 %global openeuler_major 0 @@ -363,10 +363,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 @@ -389,6 +385,9 @@ 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 cp $RPM_SOURCE_DIR/kernel-%{upstream_version}.0-%{_host_cpu}.config arch/%{Arch}/configs/openeuler_defconfig @@ -1076,6 +1075,9 @@ fi %endif %changelog +* Tue Aug 12 2025 yuelg - 6.12.33-0.0.0.2 +- adjust copying x509.genkey to be after mrproper + * Wed Jun 18 2025 laokz - 6.12.33-0.0.0.1 - upgrade to upstream v6.12.33 - reset %with_debuginfo -- Gitee