From c4214d4375cf0d2d97ad9b959b30c2e2b13d3c51 Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Sat, 18 Jan 2025 10:13:53 -0600 Subject: [PATCH] fix: change inputs to rpmrebuild (#292) --- dual-sign-zfs.sh | 5 ++++- dual-sign.sh | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dual-sign-zfs.sh b/dual-sign-zfs.sh index dd14a52f..d0127541 100755 --- 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 index b9cb0643..5de3d4af 100755 --- 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"