From ea72bc08e1ab52d5eedc69c87524e3f4f61c0fec Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Mon, 13 Nov 2023 10:52:32 +0300
Subject: [PATCH] Fix sign process

---
 SOURCES/mod-sign.sh      |  3 ++-
 SPECS/kernel-lt-6.1.spec | 12 +-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/SOURCES/mod-sign.sh b/SOURCES/mod-sign.sh
index c5f0c89..4322ab9 100755
--- a/SOURCES/mod-sign.sh
+++ b/SOURCES/mod-sign.sh
@@ -14,6 +14,7 @@ MODPUBKEY=$2
 moddir=$3
 
 modules=$(find "$moddir" -type f -name '*.ko')
+sign_file=$(find . -name 'sign-file')
 
 NPROC=$(nproc)
 [ -z "$NPROC" ] && NPROC=1
@@ -21,7 +22,7 @@ NPROC=$(nproc)
 # NB: this loop runs 2000+ iterations. Try to be fast.
 echo "$modules" | xargs -r -n16 -P $NPROC sh -c "
 for mod; do
-    ./scripts/sign-file sha256 $MODSECKEY $MODPUBKEY \$mod
+    $sign_file sha256 $MODSECKEY $MODPUBKEY \$mod
     rm -f \$mod.sig \$mod.dig
 done
 " DUMMYARG0   # xargs appends ARG1 ARG2..., which go into $mod in for loop.
diff --git a/SPECS/kernel-lt-6.1.spec b/SPECS/kernel-lt-6.1.spec
index d1d796f..1f2032c 100644
--- a/SPECS/kernel-lt-6.1.spec
+++ b/SPECS/kernel-lt-6.1.spec
@@ -55,13 +55,6 @@
 %global signmodules 0
 %endif
 
-### BCAT
-# Further investigation is required before these features
-# are enabled for the ELRepo Project kernels.
-%global signkernel 0
-%global signmodules 0
-### BCAT
-
 # Compress modules on all architectures that build modules.
 %ifarch x86_64 || aarch64
 %global zipmodules 1
@@ -712,7 +705,7 @@ popd > /dev/null
 %define __modsign_install_post \
 if [ "%{signmodules}" -eq "1" ]; then \
 	if [ "%{with_std}" -ne "0" ]; then \
-		%{SOURCE21} certs/signing_key.pem.sign certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
+        %{SOURCE21} linux-%{version}-%{release}.x86_64/certs/signing_key.pem.sign linux-%{version}-%{release}.x86_64/certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
 	fi \
 fi \
 if [ "%{zipmodules}" -eq "1" ]; then \
@@ -1489,9 +1482,6 @@ fi
 %kernel_lt_variant_files %{_use_vdso} %{with_std}
 
 %changelog
-* Sun Nov 12 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 6.1.62-1R.inferit
-- Rebuilt for MSVSphere 9.2
-
 * Sun Nov 12 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 6.1.62-1.inferit
 - Apply MSVSphere certs