summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-07-04 08:37:45 +0200
committerRemi Collet <remi@remirepo.net>2019-07-04 08:37:45 +0200
commit4d3b8607d91b08ad9c1f415a80a860d8d1e198a4 (patch)
tree31c56aa2040251cf88235f71cfcdcc7c3d63e057
parent5b6d2bb16a0eed544143e77a7152da2dbfb0ce9b (diff)
close F27 repoHEADmaster
-rw-r--r--buildfct83
-rwxr-xr-xgetmock21
-rwxr-xr-xmkallrepo14
3 files changed, 39 insertions, 79 deletions
diff --git a/buildfct b/buildfct
index 05fc91e..e880cd4 100644
--- a/buildfct
+++ b/buildfct
@@ -5,30 +5,20 @@ alias rhpkg='echo NO PLEASE, use fedpkg'
mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
-#alias mockfc26i=" setarch i686 mock --configdir=$mocketc -r fc26i --arch i686 rebuild "
-#alias mockfc26i72="setarch i686 mock --configdir=$mocketc -r fc26i72 --arch i686 rebuild "
-#alias mockfc26x=" mock --configdir=$mocketc -r fc26x rebuild "
-#alias mockfc26x72=" mock --configdir=$mocketc -r fc26x72 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 "
-#alias mockfc26xscl72=" mock --configdir=$mocketc -r fc26xscl72 rebuild "
-
-alias mockfc27i=" setarch i686 mock --configdir=$mocketc -r fc27i --arch i686 rebuild "
-alias mockfc27ir=" setarch i686 mock --configdir=$mocketc -r fc27ir --arch i686 rebuild "
-alias mockfc27i72="setarch i686 mock --configdir=$mocketc -r fc27i72 --arch i686 rebuild "
-alias mockfc27i73="setarch i686 mock --configdir=$mocketc -r fc27i73 --arch i686 rebuild "
-alias mockfc27x=" mock --configdir=$mocketc -r fc27x rebuild "
-alias mockfc27xr=" mock --configdir=$mocketc -r fc27xr rebuild "
-alias mockfc27x72=" mock --configdir=$mocketc -r fc27x72 rebuild "
-alias mockfc27x73=" mock --configdir=$mocketc -r fc27x73 rebuild "
-alias mockfc27xt=" mock --configdir=$mocketc -r fc27xt rebuild "
-alias mockfc27xscl56=" mock --configdir=$mocketc -r fc27xscl56 rebuild "
-alias mockfc27xscl70=" mock --configdir=$mocketc -r fc27xscl70 rebuild "
-alias mockfc27xscl71=" mock --configdir=$mocketc -r fc27xscl71 rebuild "
-alias mockfc27xscl72=" mock --configdir=$mocketc -r fc27xscl72 rebuild "
-alias mockfc27xscl73=" mock --configdir=$mocketc -r fc27xscl73 rebuild "
+#alias mockfc27i=" setarch i686 mock --configdir=$mocketc -r fc27i --arch i686 rebuild "
+#alias mockfc27ir=" setarch i686 mock --configdir=$mocketc -r fc27ir --arch i686 rebuild "
+#alias mockfc27i72="setarch i686 mock --configdir=$mocketc -r fc27i72 --arch i686 rebuild "
+#alias mockfc27i73="setarch i686 mock --configdir=$mocketc -r fc27i73 --arch i686 rebuild "
+#alias mockfc27x=" mock --configdir=$mocketc -r fc27x rebuild "
+#alias mockfc27xr=" mock --configdir=$mocketc -r fc27xr rebuild "
+#alias mockfc27x72=" mock --configdir=$mocketc -r fc27x72 rebuild "
+#alias mockfc27x73=" mock --configdir=$mocketc -r fc27x73 rebuild "
+#alias mockfc27xt=" mock --configdir=$mocketc -r fc27xt rebuild "
+#alias mockfc27xscl56=" mock --configdir=$mocketc -r fc27xscl56 rebuild "
+#alias mockfc27xscl70=" mock --configdir=$mocketc -r fc27xscl70 rebuild "
+#alias mockfc27xscl71=" mock --configdir=$mocketc -r fc27xscl71 rebuild "
+#alias mockfc27xscl72=" mock --configdir=$mocketc -r fc27xscl72 rebuild "
+#alias mockfc27xscl73=" mock --configdir=$mocketc -r fc27xscl73 rebuild "
alias mockfc28i=" setarch i686 mock --configdir=$mocketc -r fc28i --arch i686 rebuild "
alias mockfc28ir=" setarch i686 mock --configdir=$mocketc -r fc28ir --arch i686 rebuild "
@@ -134,7 +124,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 30 29 28 27
+ for i in 30 29 28
do
echo -n "$(date +%X) fc$i "
setarch i686 mock $quiet --configdir=$mocketc -r fc${i}i --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -157,7 +147,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 30 29 28 27
+ for i in 30 29 28
do
echo -n "$(date +%X) fc$i "
setarch i686 mock $quiet --configdir=$mocketc -r fc${i}ir --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -177,7 +167,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 30 29 28 27
+ for i in 30 29 28
do
echo -n "$(date +%X) fc$i "
setarch i686 mock $quiet --configdir=$mocketc -r fc${i}i --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -305,8 +295,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) 72 fc27 "
- setarch i686 mock $quiet --configdir=$mocketc -r fc27i72 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
echo -n "$(date +%X) 72 el6 "
setarch i686 mock $quiet --configdir=$mocketc -r el6i72 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
date +%X
@@ -329,8 +317,6 @@ if [ -f "$1" ]; then
setarch i686 mock $quiet --configdir=$mocketc -r fc29i73 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
echo -n "$(date +%X) 73 fc28 "
setarch i686 mock $quiet --configdir=$mocketc -r fc28i73 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) 73 fc27 "
- setarch i686 mock $quiet --configdir=$mocketc -r fc27i73 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
echo -n "$(date +%X) 73 el6 "
setarch i686 mock $quiet --configdir=$mocketc -r el6i73 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
date +%X
@@ -367,7 +353,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 29 27 28 30
+ for i in 29 28 30
do
echo -n "$(date +%X) fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -393,7 +379,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 29 27 28 30
+ for i in 29 28 30
do
echo -n "$(date +%X) fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xr rebuild $1 && echo " Ok." || echo " Error !"
@@ -419,7 +405,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 29 28 27 30
+ for i in 29 28 30
do
echo -n "$(date +%X) fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -483,7 +469,7 @@ fi
if [ -f "$1" ]; then
date +%X
pids=""
- for i in 30 29 28 27
+ for i in 30 29 28
do
echo -n ""
(mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (56) fc$i Ok." || echo "fc$1 Error !")&
@@ -516,7 +502,7 @@ fi
if [ -f "$1" ]; then
date +%X
pids=""
- for i in 30 29 28 27
+ for i in 30 29 28
do
echo -n ""
(mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (70) fc$i Ok." || echo "fc$1 Error !")&
@@ -549,7 +535,7 @@ fi
if [ -f "$1" ]; then
date +%X
pids=""
- for i in 28 27 29 30
+ for i in 28 29 30
do
echo -n ""
(mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (71) fc$i Ok." || echo "fc$1 Error !")&
@@ -588,12 +574,6 @@ if [ -f "$1" ]; then
(mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (72) fc$i Ok." || echo "fc$1 Error !")&
pids="$pids $!"
done
- for i in 27
- do
- echo -n ""
- (mock $quiet --configdir=$mocketc -r fc${i}x72 rebuild $1 && echo "$(date +%X) (72) fc$i Ok." || echo "fc$1 Error !")&
- pids="$pids $!"
- done
for i in 7 6
do
echo -n ""
@@ -727,11 +707,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 27
- do
- echo -n "$(date +%X) 72 fc$i "
- mock $quiet --configdir=$mocketc -r fc${i}x72 rebuild $1 && echo " Ok." || echo " Error !"
- done
for i in 8 7 6
do
echo -n "$(date +%X) 72 el$i "
@@ -753,7 +728,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 29 28 27
+ for i in 29 28
do
echo -n "$(date +%X) 73 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x73 rebuild $1 && echo " Ok." || echo " Error !"
@@ -805,7 +780,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 29 30 27 28
+ for i in 29 30 28
do
echo -n "$(date +%X) scl73 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl73 rebuild $1 && echo " Ok." || echo " Error !"
@@ -831,7 +806,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 29 28 27 30
+ for i in 29 28 30
do
echo -n "$(date +%X) scl72 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl72 rebuild $1 && echo " Ok." || echo " Error !"
@@ -857,7 +832,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 29 28 27 30
+ for i in 29 28 30
do
echo -n "$(date +%X) scl71 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild $1 && echo " Ok." || echo " Error !"
@@ -883,7 +858,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 29 30 28 27
+ for i in 29 30 28
do
echo -n "$(date +%X) scl70 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !"
@@ -909,7 +884,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 29 28 30 27
+ for i in 29 28 30
do
echo -n "$(date +%X) scl56 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild $1 && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index 0618328..5d3eccf 100755
--- a/getmock
+++ b/getmock
@@ -260,7 +260,7 @@ if [ $1 = devs -o $1 = dev ]; then
fi
if [ $1 = all ]; then
- for i in 27 28 29 30
+ for i in 28 29 30
do
getOneMock fc${i}i $opt
done
@@ -307,11 +307,6 @@ elif [ $1 = all71 ]; then
elif [ $1 = all72 ]; then
[ $opt = remi ] && opt=php72
[ $opt = test ] && opt=test72
- for n in 27
- do
- getOneMock fc${n}i $opt '*7.2*'
- getOneMock fc${n}x $opt '*7.2*'
- done
n=6
getOneMock el${n}i $opt '*7.2*'
getOneMock el${n}x $opt '*7.2*'
@@ -321,7 +316,7 @@ elif [ $1 = all72 ]; then
elif [ $1 = all73 ]; then
[ $opt = remi ] && opt=php73
[ $opt = test ] && opt=test73
- for n in 27 28 29
+ for n in 28 29
do
getOneMock fc${n}i $opt '*7.3*'
getOneMock fc${n}x $opt '*7.3*'
@@ -354,7 +349,7 @@ elif [ $1 = for55 ]; then
done
elif [ $1 = allx ]; then
- for i in 27 28 29 30
+ for i in 28 29 30
do
getOneMock fc${i}x $opt
done
@@ -376,7 +371,7 @@ elif [ $1 = scl55 ]; then
done
elif [ $1 = scl56 ]; then
- for i in 27 28 29 30
+ for i in 28 29 30
do
getOneMock scl56fc${i}x $opt
done
@@ -386,7 +381,7 @@ elif [ $1 = scl56 ]; then
done
elif [ $1 = scl70 ]; then
- for i in 27 28 29 30
+ for i in 28 29 30
do
getOneMock scl70fc${i}x $opt
done
@@ -396,7 +391,7 @@ elif [ $1 = scl70 ]; then
done
elif [ $1 = scl71 ]; then
- for i in 27 28 29 30
+ for i in 28 29 30
do
getOneMock scl71fc${i}x $opt
done
@@ -416,7 +411,7 @@ elif [ $1 = scl74 ]; then
done
elif [ $1 = scl73 ]; then
- for i in 27 28 29 30
+ for i in 28 29 30
do
getOneMock scl73fc${i}x $opt
done
@@ -426,7 +421,7 @@ elif [ $1 = scl73 ]; then
done
elif [ $1 = scl72 ]; then
- for i in 27 28 29 30
+ for i in 28 29 30
do
getOneMock scl72fc${i}x $opt
done
diff --git a/mkallrepo b/mkallrepo
index 16b24a8..63507fb 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -9,7 +9,7 @@ TMPSIG4=$(mktemp -t XXXXXXXX.2019)
cd /home/rpmbuild/site/rpms
-for dep in fedora/{26,27,28,29,30}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
+for dep in fedora/{28,29,30}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
do
[[ $dep =~ /modular ]] && continue
@@ -35,9 +35,6 @@ find SRPMS -name \*.rpm -a -newer SRPMS/repodata -print >>$TMPSIG
if [ -s $TMPSIG ]; then
echo "À signer:"; sort < $TMPSIG
- grep fc26 $TMPSIG > $TMPSIG2
- grep fc27 $TMPSIG >> $TMPSIG2
-
grep fc28 $TMPSIG > $TMPSIG3
grep fc29 $TMPSIG >> $TMPSIG3
grep el8 $TMPSIG >> $TMPSIG3
@@ -59,13 +56,6 @@ if [ -s $TMPSIG ]; then
else exit 1
fi
fi
- if [ -s $TMPSIG2 ]; then
- echo "== Signature des $(cat $TMPSIG2 | wc -l) nouveaux RPM (2017) =="
- if rpmsign --define '_gpg_path /home/remi/.gnupg2017' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG2)
- then echo done.
- else exit 1
- fi
- fi
grep -v fc26 $TMPSIG | grep -v fc27 | grep -v fc28 | grep -v fc29 | grep -v fc30 | grep -v src.rpm | grep -v el8 > $TMPSIG1
if [ -s $TMPSIG1 ]; then
echo "== Signature des $(cat $TMPSIG1 | wc -l) nouveaux RPM (old) =="
@@ -91,7 +81,7 @@ then echo "== Création des liens (noarch) =="
else echo "Rien à lier."
fi
-for dep in SRPMS fedora/{26,27,28,29,30}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
+for dep in SRPMS fedora/{28,29,30}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
do
[[ $dep =~ /modular ]] && continue