From 54cef4d8e83ba5b3a1a11c013eb8e81973e7a8a3 Mon Sep 17 00:00:00 2001 From: ebasov Date: Thu, 26 Dec 2024 16:30:11 +0300 Subject: [PATCH] clean .Spec --- SPECS/kernel-6.1.spec | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/SPECS/kernel-6.1.spec b/SPECS/kernel-6.1.spec index ccab012..2ea1685 100644 --- a/SPECS/kernel-6.1.spec +++ b/SPECS/kernel-6.1.spec @@ -812,10 +812,6 @@ BuildKernel() { # We'll get it from the linux-firmware package and we don't want conflicts. %{make} %{?_smp_mflags} ARCH=%{bldarch} INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw= - ls $RPM_BUILD_ROOT/ - find $RPM_BUILD_ROOT/ -name dm_mod.ko -type f -print - - # Add a noop %%defattr statement because rpm doesn't like empty file list files. echo '%%defattr(-,-,-)' > ../%{name}${Variant:+-${Variant}}-ldsoconf.list @@ -1062,9 +1058,7 @@ BuildKernel() { cp $RPM_SOURCE_DIR/filter-*.sh . ./filter-modules.sh modules.list %{_target_cpu} rm -f filter-*.sh - - - + %ifarch aarch64 find lib/modules/$KernelVer/kernel -mindepth 1 -type d | sort -n > module-dirs.list @@ -1111,7 +1105,6 @@ BuildKernel() { # Cleanup. rm -f System.map cp -r restore/* lib/modules/$KernelVer/ - rm -fr restore popd > /dev/null @@ -1263,12 +1256,12 @@ popd > /dev/null %install -#%define __modsign_install_post \ -#if [ "%{signmodules}" -eq "1" ]; then \ -# if [ "%{with_std}" -ne "0" ]; then \ -# %{SOURCE21} linux-%{version}-%{release}.%{_build_arch}/certs/signing_key.pem.sign${Variant:++${Variant}} linux-%{version}-%{release}.%{_build_arch}/certs/signing_key.x509.sign${Variant:++${Variant}} $RPM_BUILD_ROOT${Variant:++${Variant}}/lib/modules/%{KVERREL}/ \ -# fi \ -#fi \ +%define __modsign_install_post \ +if [ "%{signmodules}" -eq "1" ]; then \ + if [ "%{with_std}" -ne "0" ]; then \ + %{SOURCE21} linux-%{version}-%{release}.%{_build_arch}/certs/signing_key.pem.sign${Variant:++${Variant}} linux-%{version}-%{release}.%{_build_arch}/certs/signing_key.x509.sign${Variant:++${Variant}} $RPM_BUILD_ROOT${Variant:++${Variant}}/lib/modules/%{KVERREL}/ \ + fi \ +fi \ if [ "%{zipmodules}" -eq "1" ]; then \ find $RPM_BUILD_ROOT/lib/modules/ -name '*.ko' -type f | xargs --no-run-if-empty -P%{zcpu} xz \ fi \