From 301331ca9432536ce3879b235c8b8b58a0a48db4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 22 Aug 2017 15:38:19 +0200
Subject: start F27 support, drop F23
---
buildfct | 64 +++++++++++++++++++++++++++++++++------------------------------
mkallrepo | 7 ++++---
2 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/buildfct b/buildfct
index 7cfddfa..79401a6 100644
--- a/buildfct
+++ b/buildfct
@@ -15,18 +15,18 @@ mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
#alias mockfc22xscl70=" mock --configdir=$mocketc -r fc22xscl70 rebuild "
#alias mockfc22xscl71=" mock --configdir=$mocketc -r fc22xscl71 rebuild "
-alias mockfc23i=" setarch i686 mock --configdir=$mocketc -r fc23i --arch i686 rebuild "
-alias mockfc23i70="setarch i686 mock --configdir=$mocketc -r fc23i70 --arch i686 rebuild "
-alias mockfc23i71="setarch i686 mock --configdir=$mocketc -r fc23i71 --arch i686 rebuild "
-alias mockfc23x=" mock --configdir=$mocketc -r fc23x rebuild "
-alias mockfc23x70=" mock --configdir=$mocketc -r fc23x70 rebuild "
-alias mockfc23d70=" mock --configdir=$mocketc -r fc23d70 rebuild "
-alias mockfc23x71=" mock --configdir=$mocketc -r fc23x71 rebuild "
-alias mockfc23xscl54=" mock --configdir=$mocketc -r fc23xscl54 rebuild "
-alias mockfc23xscl55=" mock --configdir=$mocketc -r fc23xscl55 rebuild "
-alias mockfc23xscl56=" mock --configdir=$mocketc -r fc23xscl56 rebuild "
-alias mockfc23xscl70=" mock --configdir=$mocketc -r fc23xscl70 rebuild "
-alias mockfc23xscl71=" mock --configdir=$mocketc -r fc23xscl71 rebuild "
+#alias mockfc23i=" setarch i686 mock --configdir=$mocketc -r fc23i --arch i686 rebuild "
+#alias mockfc23i70="setarch i686 mock --configdir=$mocketc -r fc23i70 --arch i686 rebuild "
+#alias mockfc23i71="setarch i686 mock --configdir=$mocketc -r fc23i71 --arch i686 rebuild "
+#alias mockfc23x=" mock --configdir=$mocketc -r fc23x rebuild "
+#alias mockfc23x70=" mock --configdir=$mocketc -r fc23x70 rebuild "
+#alias mockfc23d70=" mock --configdir=$mocketc -r fc23d70 rebuild "
+#alias mockfc23x71=" mock --configdir=$mocketc -r fc23x71 rebuild "
+#alias mockfc23xscl54=" mock --configdir=$mocketc -r fc23xscl54 rebuild "
+#alias mockfc23xscl55=" mock --configdir=$mocketc -r fc23xscl55 rebuild "
+#alias mockfc23xscl56=" mock --configdir=$mocketc -r fc23xscl56 rebuild "
+#alias mockfc23xscl70=" mock --configdir=$mocketc -r fc23xscl70 rebuild "
+#alias mockfc23xscl71=" mock --configdir=$mocketc -r fc23xscl71 rebuild "
alias mockfc24i=" setarch i686 mock --configdir=$mocketc -r fc24i --arch i686 rebuild "
alias mockfc24i70="setarch i686 mock --configdir=$mocketc -r fc24i70 --arch i686 rebuild "
@@ -60,6 +60,14 @@ alias mockfc26xscl70=" mock --configdir=$mocketc -r fc26xscl70
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 mockfc27x=" mock --configdir=$mocketc -r fc27x 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 mockel4i="setarch i686 mock --configdir=$mocketc -r el4i --arch i386 rebuild "
#alias mockel4it="setarch i686 mock --configdir=$mocketc -r el4it --arch i386 rebuild "
#alias mockel4x=" mock --configdir=$mocketc -r el4x rebuild "
@@ -122,7 +130,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 26 24 23
+ for i in 25 26 24
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 !"
@@ -201,8 +209,6 @@ fi
if [ -f "$1" ]; then
echo -n "$(date +%X) 70 fc24 "
setarch i686 mock $quiet --configdir=$mocketc -r fc24i70 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) 70 fc23 "
- setarch i686 mock $quiet --configdir=$mocketc -r fc23i70 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
echo -n "$(date +%X) 70 el6 "
setarch i686 mock $quiet --configdir=$mocketc -r el6i70 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
date +%X
@@ -225,8 +231,6 @@ if [ -f "$1" ]; then
setarch i686 mock $quiet --configdir=$mocketc -r fc25i71 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
echo -n "$(date +%X) 71 fc24 "
setarch i686 mock $quiet --configdir=$mocketc -r fc24i71 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) 71 fc23 "
- setarch i686 mock $quiet --configdir=$mocketc -r fc23i71 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
echo -n "$(date +%X) 71 el6 "
setarch i686 mock $quiet --configdir=$mocketc -r el6i71 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
date +%X
@@ -245,7 +249,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 23 24
+ for i in 25 24
do
echo -n "$(date +%X) test-fc$i "
setarch i686 mock $quiet --configdir=$mocketc -r fc${i}it --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -268,7 +272,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 26 24 23
+ for i in 25 26 27 24
do
echo -n "$(date +%X) fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -316,7 +320,7 @@ fi
if [ -f "$1" ]; then
date +%X
pids=""
- for i in 26 25 24 23
+ for i in 27 26 25 24
do
echo -n ""
(mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (56) fc$i Ok." || echo "fc$1 Error !")&
@@ -346,13 +350,13 @@ fi
if [ -f "$1" ]; then
date +%X
pids=""
- for i in 26 25
+ for i in 27 26 25
do
echo -n ""
(mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (70) fc$i Ok." || echo "fc$1 Error !")&
pids="$pids $!"
done
- for i in 24 23
+ for i in 24
do
echo -n ""
(mock $quiet --configdir=$mocketc -r fc${i}x70 rebuild $1 && echo "$(date +%X) (70) fc$i Ok." || echo "fc$1 Error !")&
@@ -423,7 +427,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 23 24
+ for i in 24
do
echo -n "$(date +%X) 70 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x70 rebuild $1 && echo " Ok." || echo " Error !"
@@ -449,7 +453,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 24 23
+ for i in 25 24
do
echo -n "$(date +%X) 71 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x71 rebuild $1 && echo " Ok." || echo " Error !"
@@ -501,7 +505,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 26 24 23
+ for i in 25 26 24
do
echo -n "$(date +%X) scl71 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild $1 && echo " Ok." || echo " Error !"
@@ -527,7 +531,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 26 24 23
+ for i in 25 26 24
do
echo -n "$(date +%X) scl70 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !"
@@ -553,7 +557,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 23 24 26
+ for i in 25 24 26
do
echo -n "$(date +%X) scl56 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild $1 && echo " Ok." || echo " Error !"
@@ -579,7 +583,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 23 24
+ for i in 25 24
do
echo -n "$(date +%X) scl55 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl55 rebuild $1 && echo " Ok." || echo " Error !"
@@ -605,7 +609,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 24 23
+ for i in 25 24
do
echo -n "$(date +%X) scl54 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl54 rebuild $1 && echo " Ok." || echo " Error !"
@@ -631,7 +635,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 25 24 23
+ for i in 25 24
do
echo -n "$(date +%X) test-fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xt rebuild $1 && echo " Ok." || echo " Error !"
diff --git a/mkallrepo b/mkallrepo
index 219c47a..bf8a796 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -7,7 +7,7 @@ TMPSIG2=$(mktemp)
cd /home/rpmbuild/site/rpms
#for dep in *.{i386,ppc,ppc64,x86_64} fedora/*/*/{i386,ppc,ppc64,x86_64}
-for dep in fedora/{23,24,25,26}/*/{i386,x86_64} enterprise/{6,7}/*/{i386,x86_64}
+for dep in fedora/{23,24,25,26,27}/*/{i386,x86_64} enterprise/{6,7}/*/{i386,x86_64}
do
arch=${dep##*/}
@@ -32,6 +32,7 @@ if [ -s $TMPSIG ]; then
echo "À signer:"; sort < $TMPSIG
grep fc26 $TMPSIG > $TMPSIG2
+ grep fc27 $TMPSIG >> $TMPSIG2
grep src.rpm $TMPSIG >> $TMPSIG2
if [ -s $TMPSIG2 ]; then
echo "== Signature des $(cat $TMPSIG2 | wc -l) nouveaux RPM (new) =="
@@ -41,7 +42,7 @@ if [ -s $TMPSIG ]; then
fi
fi
- grep -v fc26 $TMPSIG | grep -v src.rpm > $TMPSIG2
+ grep -v fc26 $TMPSIG | grep -v fc27 | grep -v src.rpm > $TMPSIG2
if [ -s $TMPSIG2 ]; then
echo "== Signature des $(cat $TMPSIG2 | wc -l) nouveaux RPM (old) =="
if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name Remi Collet" --addsign $(cat $TMPSIG2)
@@ -66,7 +67,7 @@ else echo "Rien à lier."
fi
#for dep in *.{i386,ppc,ppc64,x86_64} fedora/*/*/{i386,ppc,ppc64,x86_64}
-for dep in SRPMS fedora/{23,24,25,26}/*/{i386,x86_64} enterprise/{6,7}/*/{i386,x86_64}
+for dep in SRPMS fedora/{23,24,25,26,27}/*/{i386,x86_64} enterprise/{6,7}/*/{i386,x86_64}
do
if [ -d $dep/repodata -a $dep -nt $dep/repodata -a ! -f $dep/.closed ]
then echo "== Actualisation de $dep =="
--
cgit