fix: change inputs to rpmrebuild (#292)

ublue-os · Jan 18, 2025 · c4214d4 · c4214d4
1 parent 699f1fe
commit c4214d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/dual-sign-zfs.sh b/dual-sign-zfs.sh
@@ -32,7 +32,10 @@ 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
@@ -30,7 +30,8 @@ if [[ "${DUAL_SIGN}" == "true" ]]; then
         fi
     done
     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"