Skip to content

Commit c4214d4

Browse files
authored
fix: change inputs to rpmrebuild (#292)
1 parent 699f1fe commit c4214d4

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

dual-sign-zfs.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ if [[ "${DUAL_SIGN}" == "true" ]]; then
3232
/tmp/dual-sign-check.sh "${KERNEL}" "${module}" "${PUBLIC_CHAIN}"
3333
fi
3434
done
35-
rpmrebuild --additional=--buildroot=/tmp/buildroot --batch /var/cache/rpms/kmods/zfs/kmod-zfs-*.rpm
35+
find /var/cache/rpms/kmods/zfs -type f -name "\kmod-*.rpm" | grep -v debug | grep -v devel
36+
RPMPATH=$(find /var/cache/rpms/kmods/zfs -type f -name "\kmod-*.rpm" | grep -v debug | grep -v devel)
37+
RPM=$(basename $(echo "${RPMPATH}" | sed 's/\.rpm//'))
38+
rpmrebuild --additional=--buildroot=/tmp/buildroot --batch "${RPM}"
3639
rm -rf /usr/lib/modules/"${KERNEL}"/extra
3740
dnf reinstall -y /root/rpmbuild/RPMS/"$(uname -m)"/kmod-*-"${KERNEL}"-*.rpm
3841
for module in /usr/lib/modules/"${KERNEL}"/extra/*/*.ko*; do

dual-sign.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ if [[ "${DUAL_SIGN}" == "true" ]]; then
3030
fi
3131
done
3232
find /var/cache/akmods -type f -name "\kmod-*.rpm"
33-
for RPM in $(find /var/cache/akmods/ -type f -name \kmod-*.rpm); do
33+
for RPMPATH in $(find /var/cache/akmods/ -type f -name \kmod-*.rpm); do
34+
RPM=$(basename $(echo "${RPMPATH}" | sed 's/\.rpm//'))
3435
mkdir -p /tmp/buildroot
3536
cp -r /{usr,lib} /tmp/buildroot
3637
rpmrebuild --additional=--buildroot=/tmp/buildroot --batch "$RPM"

0 commit comments

Comments
 (0)