From f0ff8e8913f6f4dd5bfea4024bea4fce96bc2f88 Mon Sep 17 00:00:00 2001
From: Benjamin Sherman <benjamin@holyarmy.org>
Date: Sat, 18 Jan 2025 00:14:32 -0600
Subject: [PATCH] fix: change inputs to rpmrebuild

rpmrebuild updated from 2.17 to 2.20 in Fedora repos, changing the
function function which checks if a package is installed.

This fixes the inputs to that command.
---
 dual-sign-zfs.sh | 6 +++++-
 dual-sign.sh     | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dual-sign-zfs.sh b/dual-sign-zfs.sh
index dd14a52f..b75753ee 100755
--- a/dual-sign-zfs.sh
+++ b/dual-sign-zfs.sh
@@ -32,7 +32,11 @@ if [[ "${DUAL_SIGN}" == "true" ]]; then
             /tmp/dual-sign-check.sh "${KERNEL}" "${module}" "${PUBLIC_CHAIN}"
         fi
     done
-    rpmrebuild --additional=--buildroot=/tmp/buildroot --batch /var/cache/rpms/kmods/zfs/kmod-zfs-*.rpm
+
+    find /var/cache/rpms/kmods/zfs -type f -name "\kmod-*.rpm" | grep -v debug | grep -v devel
+    RPMPATH=$(find /var/cache/rpms/kmods/zfs -type f -name "\kmod-*.rpm" | grep -v debug | grep -v devel)
+    RPM=$(basename $( echo ${RPMPATH} | sed 's/\.rpm//' ))
+    rpmrebuild --additional=--buildroot=/tmp/buildroot --batch ${RPM}
     rm -rf /usr/lib/modules/"${KERNEL}"/extra
     dnf reinstall -y /root/rpmbuild/RPMS/"$(uname -m)"/kmod-*-"${KERNEL}"-*.rpm
     for module in /usr/lib/modules/"${KERNEL}"/extra/*/*.ko*; do
diff --git a/dual-sign.sh b/dual-sign.sh
index b9cb0643..56c75f99 100755
--- a/dual-sign.sh
+++ b/dual-sign.sh
@@ -29,8 +29,12 @@ if [[ "${DUAL_SIGN}" == "true" ]]; then
             /tmp/dual-sign-check.sh "${KERNEL}" "${module}" "${PUBLIC_CHAIN}"
         fi
     done
+
+    rpm -qa |grep kmod
+
     find /var/cache/akmods -type f -name "\kmod-*.rpm"
-    for RPM in $(find /var/cache/akmods/ -type f -name \kmod-*.rpm); do
+    for RPMPATH in $(find /var/cache/akmods/ -type f -name \kmod-*.rpm); do
+        RPM=$(basename $( echo ${RPMPATH} | sed 's/\.rpm//' ))
         mkdir -p /tmp/buildroot
         cp -r /{usr,lib} /tmp/buildroot
         rpmrebuild --additional=--buildroot=/tmp/buildroot --batch "$RPM"