diff options
| -rwxr-xr-x | mkallrepo | 21 | ||||
| -rwxr-xr-x | mkmodular | 2 | ||||
| -rwxr-xr-x | mkrepo | 8 |
3 files changed, 23 insertions, 8 deletions
@@ -3,10 +3,10 @@ TMPSIG=$(mktemp) TMPLNK=$(mktemp) TMPSIG1=$(mktemp -t XXXXXXXX.2000) -TMPSIG2=$(mktemp -t XXXXXXXX.2017) TMPSIG3=$(mktemp -t XXXXXXXX.2018) TMPSIG4=$(mktemp -t XXXXXXXX.2019) TMPSIG2020=$(mktemp -t XXXXXXXX.2020) +TMPSIG2021=$(mktemp -t XXXXXXXX.2021) cd /home/rpmbuild/site/rpms @@ -36,15 +36,27 @@ find SRPMS -name \*.rpm -a -newer SRPMS/repodata -print >>$TMPSIG if [ -s $TMPSIG ]; then echo "À signer:"; sort < $TMPSIG + # old + grep el7 $TMPSIG > $TMPSIG1 + # 2018 grep el8 $TMPSIG > $TMPSIG3 - + # 2019 grep fc30 $TMPSIG > $TMPSIG4 grep fc31 $TMPSIG >> $TMPSIG4 - + # 2020 grep fc32 $TMPSIG > $TMPSIG2020 grep fc33 $TMPSIG >> $TMPSIG2020 - grep src.rpm $TMPSIG >> $TMPSIG2020 + # 2021 + grep fc34 $TMPSIG > $TMPSIG2021 + grep src.rpm $TMPSIG >> $TMPSIG2021 + if [ -s $TMPSIG2021 ]; then + echo "== Signature des $(cat $TMPSIG2021 | wc -l) nouveaux RPM (2021) ==" + if rpmsign --define '_gpg_path /home/remi/.gnupg2021' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG2021) + then echo done. + else exit 1 + fi + fi if [ -s $TMPSIG2020 ]; then echo "== Signature des $(cat $TMPSIG2020 | wc -l) nouveaux RPM (2020) ==" if rpmsign --define '_gpg_path /home/remi/.gnupg2020' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG2020) @@ -66,7 +78,6 @@ if [ -s $TMPSIG ]; then else exit 1 fi fi - grep -v fc3 $TMPSIG | grep -v src.rpm | grep -v el8 > $TMPSIG1 if [ -s $TMPSIG1 ]; then echo "== Signature des $(cat $TMPSIG1 | wc -l) nouveaux RPM (old) ==" if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name Remi Collet" --addsign $(cat $TMPSIG1) @@ -240,7 +240,7 @@ EOT; function findPackages($from, $dest, $pat) { global $oldrpms; - $excl = ['php-amqplib', 'php-jsonlint', 'php-laminas-mime']; + $excl = ['php-amqplib', 'php-jsonlint', 'php-laminas-mime', 'php-cs-fixer']; $rpms = []; foreach (glob("$from/$pat") as $file) { $info = rpminfo($file); @@ -12,7 +12,7 @@ then elif [ "$nom" = "SRPMS" ] then dis=fedora - ver=33 + ver=34 old=8 dst=/data/rpms/SRPMS.remi else @@ -28,7 +28,11 @@ if [ ${1:-check} != nocheck ]; then rpm -K *.rpm | grep -v 'signatures.*OK' | cut -d: -f1 | tee $TMP if [ -s $TMP ] then - if [ "$dis" == "fedora" -a "$ver" -ge 32 ] + if [ "$dis" == "fedora" -a "$ver" -ge 34 ] + then echo "key 2021" + rpmsign --define '_gpg_path /home/remi/.gnupg2021' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMP) + + elif [ "$dis" == "fedora" -a "$ver" -ge 32 ] then echo "key 2020" rpmsign --define '_gpg_path /home/remi/.gnupg2020' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMP) |