summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-08-11 08:24:44 +0200
committerRemi Collet <remi@remirepo.net>2017-08-11 08:24:44 +0200
commit729d9be15ff95e89ae56254f8602d1f87802325e (patch)
treefb2e988c7b6b8ef6f3a2d372a1a86387b674070c
parent24f69e929f9e0a4181bb1dbb6c0d138ce72e46a4 (diff)
minor changes
-rw-r--r--buildfct3
-rwxr-xr-xgetmock1
-rwxr-xr-xmkrepo10
3 files changed, 9 insertions, 5 deletions
diff --git a/buildfct b/buildfct
index 04a25eb..7cfddfa 100644
--- a/buildfct
+++ b/buildfct
@@ -54,6 +54,7 @@ alias mockfc25xscl72=" mock --configdir=$mocketc -r fc25xscl72
alias mockfc26i=" setarch i686 mock --configdir=$mocketc -r fc26i --arch i686 rebuild "
alias mockfc26x=" mock --configdir=$mocketc -r fc26x rebuild "
+alias mockfc26xt=" mock --configdir=$mocketc -r fc26xt rebuild "
alias mockfc26xscl56=" mock --configdir=$mocketc -r fc26xscl56 rebuild "
alias mockfc26xscl70=" mock --configdir=$mocketc -r fc26xscl70 rebuild "
alias mockfc26xscl71=" mock --configdir=$mocketc -r fc26xscl71 rebuild "
@@ -267,7 +268,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 26 23 24
+ for i in 25 26 24 23
do
echo -n "$(date +%X) fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index 460bb34..5401d6c 100755
--- a/getmock
+++ b/getmock
@@ -334,6 +334,7 @@ elif [ $1 = scl71 ]; then
done
elif [ $1 = scl72 ]; then
+ opt=test
for i in 24 25 26
do
getOneMock scl72fc${i}x $opt
diff --git a/mkrepo b/mkrepo
index cb75f98..c230b5c 100755
--- a/mkrepo
+++ b/mkrepo
@@ -17,12 +17,14 @@ fi
if [ ${1:-check} != nocheck ]; then
echo "+ Controle des signatures"
- rpm -K *.rpm | grep -v 'gpg OK' | cut -d: -f1 | tee $TMP
+ rpm -K *.rpm | grep -v 'gpg.*OK' | grep -v 'pgp.*OK' | cut -d: -f1 | tee $TMP
if [ -s $TMP ]
then
- if [ $dis == fedora -a $ver -ge 26 ]
- then rpmsign --define '_gpg_path /home/remi/.gnupg2017' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMP)
- else rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name Remi Collet" --addsign $(cat $TMP)
+ if [ "$dis" == "fedora" -a "$ver" -ge 26 ]
+ then echo "key 2017"
+ rpmsign --define '_gpg_path /home/remi/.gnupg2017' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMP)
+ else echo "old key"
+ rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name Remi Collet" --addsign $(cat $TMP)
fi
else echo OK.
fi