From d40bd182b73fb694cf92d36bd8fec9e4296744bf Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 17 Jan 2019 10:07:29 +0100
Subject: EL8 stuff

---
 buildfct     | 20 +++++++++++++++++---
 cleanoldmeta |  3 +--
 getmock      | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
 mkallrepo    |  7 ++++---
 mkrepo       | 25 +++++++++++++------------
 5 files changed, 80 insertions(+), 30 deletions(-)

diff --git a/buildfct b/buildfct
index 5729db4..5715437 100644
--- a/buildfct
+++ b/buildfct
@@ -131,6 +131,11 @@ alias mockel7xscl71="          mock --configdir=$mocketc -r el7xscl71          r
 alias mockel7xscl72="          mock --configdir=$mocketc -r el7xscl72          rebuild "
 alias mockel7xscl73="          mock --configdir=$mocketc -r el7xscl73          rebuild "
 
+alias mockel8x="               mock --configdir=$mocketc -r el8x               rebuild "
+alias mockel8x72="             mock --configdir=$mocketc -r el8x72             rebuild "
+alias mockel8x73="             mock --configdir=$mocketc -r el8x73             rebuild "
+alias mockel8xscl73="          mock --configdir=$mocketc -r el8xscl73          rebuild "
+
 alias mockdevi="setarch i686 mock -r fedora-devel-i386   rebuild "
 alias mockdevx="             mock -r fedora-devel-x86_64 rebuild "
 
@@ -461,6 +466,9 @@ if [ -f "$1" ]; then
     (mock $quiet --configdir=$mocketc -r el${i}x56 rebuild $1 && echo "$(date +%X) (56) el$i   Ok." || echo "el$i  Error !")&
     pids="$pids $!"
   done
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el8x   rebuild $1 && echo "$(date +%X) (72) el8   Ok." || echo "el8  Error !")&
+    pids="$pids $!"
   wait $pids
   date +%X
 else
@@ -491,6 +499,9 @@ if [ -f "$1" ]; then
     (mock $quiet --configdir=$mocketc -r el${i}x70 rebuild $1 && echo "$(date +%X) (70) el$i   Ok." || echo "el$i  Error !")&
     pids="$pids $!"
   done
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el8x   rebuild $1 && echo "$(date +%X) (72) el8   Ok." || echo "el8  Error !")&
+    pids="$pids $!"
   wait $pids
   date +%X
 else
@@ -521,6 +532,9 @@ if [ -f "$1" ]; then
     (mock $quiet --configdir=$mocketc -r el${i}x71 rebuild $1 && echo "$(date +%X) (71) el$i   Ok." || echo "el$i  Error !")&
     pids="$pids $!"
   done
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el8x   rebuild $1 && echo "$(date +%X) (72) el8   Ok." || echo "el8  Error !")&
+    pids="$pids $!"
   wait $pids
   date +%X
 else
@@ -627,7 +641,7 @@ if [ -f "$1" ]; then
     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 7 6
+  for i in 8 7 6
   do
     echo -n "$(date +%X) 72 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x72 rebuild $1 && echo " Ok." || echo " Error !"
@@ -653,7 +667,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) 73 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x73 rebuild $1 && echo " Ok." || echo " Error !"
   done
-  for i in 7 6
+  for i in 8 7 6
   do
     echo -n "$(date +%X) 73 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x73 rebuild $1 && echo " Ok." || echo " Error !"
@@ -679,7 +693,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) scl73 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl73 rebuild $1 && echo " Ok." || echo " Error !"
   done
-  for i in 6 7
+  for i in 6 7 8
   do
     echo -n "$(date +%X) scl73 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl73 rebuild $1 && echo " Ok." || echo " Error !"
diff --git a/cleanoldmeta b/cleanoldmeta
index 21714a9..70c3710 100755
--- a/cleanoldmeta
+++ b/cleanoldmeta
@@ -22,12 +22,11 @@ function clean ($path) {
 	}
 	foreach ($tab as $n => $files) {
 		if (count($tab[$n]) > KEEP) {
-			echo "  $n\n";
 			krsort($tab[$n]);
 			while (count($tab[$n]) > KEEP) {
 				$f = array_pop($tab[$n]);
 				if (unlink("$path/$f")) {
-					echo "    $f\n";
+					echo "  $f\n";
 				}
 			}
 		}
diff --git a/getmock b/getmock
index e9a3426..aefc8e3 100755
--- a/getmock
+++ b/getmock
@@ -11,6 +11,9 @@ case $1 in
 *)	dep=$1
 	;;
 esac
+
+rep=${2-remi}
+
 case $dep in 
 scl73el*)	dep=${dep#scl73el}
 	type=enterprise
@@ -33,6 +36,26 @@ scl55el*)	dep=${dep#scl55el}
 scl54el*)	dep=${dep#scl54el}
 	type=enterprise
 	;;
+el8x72)
+	dep=8
+    if [ "$2" == "php72" -o "$2" == "test72" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php72
+	else	rep=${2}72
+	fi
+	type=enterprise
+	;;
+el8x73)
+	dep=8
+    if [ "$2" == "php73" -o "$2" == "test73" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php73
+	else	rep=${2}73
+	fi
+	type=enterprise
+	;;
 el*)	dep=${dep#el}
 	type=enterprise
 	;;
@@ -65,12 +88,12 @@ scl54fc*)	dep=${dep#scl54fc}
 esac
 
 
-if [ -d $type/$dep/${2-remi}/x86_64 ]
+if [ -d $type/$dep/$rep/x86_64 ]
 then
-	cible=$type/$dep/${2-remi}/
-	debug=$type/$dep/debug-${2-remi}/
+	cible=$type/$dep/$rep/
+	debug=$type/$dep/debug-$rep/
 else 
-	echo "$1 n'est pas un dépôt ($type/$dep/${2-remi})"
+	echo "$1 n'est pas un dépôt ($type/$dep/$rep)"
 	exit 2
 fi
 
@@ -177,6 +200,14 @@ if [ $1 = test71 ]; then
 	opt=test71
 	shift
 fi
+if [ $1 = test72 ]; then
+	opt=test72
+	shift
+fi
+if [ $1 = test72 ]; then
+	opt=test72
+	shift
+fi
 if [ $1 = php55 ]; then
 	opt=php55
 	shift
@@ -213,6 +244,10 @@ if [ $1 = glpi93 ]; then
 	opt=glpi93
 	shift
 fi
+if [ $1 = glpi94 ]; then
+	opt=glpi94
+	shift
+fi
 if [ $1 = devs -o $1 = dev ]; then
 	opt=devs
 	shift
@@ -274,8 +309,8 @@ elif [ $1 = all72 ]; then
 	n=6
 		getOneMock el${n}i $opt '*7.2*'
 		getOneMock el${n}x $opt '*7.2*'
-	n=7
-		getOneMock el${n}x $opt '*7.2*'
+		getOneMock el7x    $opt '*7.2*'
+		getOneMock el8x72  $opt '*7.2*'
 
 elif [ $1 = all73 ]; then
 	[ $opt = remi ] && opt=php73
@@ -288,8 +323,8 @@ elif [ $1 = all73 ]; then
 	n=6
 		getOneMock el${n}i $opt '*7.3*'
 		getOneMock el${n}x $opt '*7.3*'
-	n=7
-		getOneMock el${n}x $opt '*7.3*'
+		getOneMock el7x    $opt '*7.3*'
+		getOneMock el8x73  $opt '*7.3*'
 
 elif [ $1 = all54 ]; then
 	for n in 6
@@ -317,7 +352,7 @@ elif [ $1 = allx ]; then
 	do
 		getOneMock fc${i}x $opt
 	done
-	for i in 6 7
+	for i in 6 7 8
 	do
 		getOneMock el${i}x $opt
 	done
@@ -369,7 +404,7 @@ elif [ $1 = scl73 ]; then
 	do
 		getOneMock scl73fc${i}x $opt
 	done
-	for i in 6 7
+	for i in 6 7 8
 	do
 		getOneMock scl73el${i}x $opt
 	done
diff --git a/mkallrepo b/mkallrepo
index 784078a..3614754 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -8,7 +8,7 @@ TMPSIG3=$(mktemp)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{24,25,26,27,28,29}/*/{i386,x86_64} enterprise/{6,7}/*/{i386,x86_64,armhfp}
+for dep in fedora/{24,25,26,27,28,29}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
 do
 	arch=${dep##*/}
 
@@ -37,6 +37,7 @@ if [ -s $TMPSIG ]; then
 
     grep fc28    $TMPSIG  > $TMPSIG3
     grep fc29    $TMPSIG >> $TMPSIG3
+    grep el8     $TMPSIG >> $TMPSIG3
     grep src.rpm $TMPSIG >> $TMPSIG3
 
     if [ -s $TMPSIG3 ]; then
@@ -53,7 +54,7 @@ if [ -s $TMPSIG ]; then
 		else 	exit 1
 		fi
 	fi
-	grep -v fc26 $TMPSIG | grep -v fc27 | grep -v fc28 | grep -v fc29 | grep -v src.rpm > $TMPSIG1
+	grep -v fc26 $TMPSIG | grep -v fc27 | grep -v fc28 | grep -v fc29 | 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)
@@ -78,7 +79,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{24,25,26,27,28,29}/*/{i386,x86_64} enterprise/{6,7}/*/{i386,x86_64,armhfp}
+for dep in SRPMS fedora/{24,25,26,27,28,29}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
 do
 	if [ -d $dep/repodata -a $dep -nt $dep/repodata -a ! -f $dep/.closed ]
 	then	echo "== Actualisation de $dep =="
diff --git a/mkrepo b/mkrepo
index aa0f86c..a222a68 100755
--- a/mkrepo
+++ b/mkrepo
@@ -33,25 +33,26 @@ if [ ${1:-check} != nocheck ]; then
 	fi
 fi
 
-echo "+ Nettoyage des anciens ($old)"
+if [ ${2:-clean} != noclean ]; then
+	echo "+ Nettoyage des anciens ($old)"
 
-# use old deprecated yum command see https://bugzilla.redhat.com/1537981
-#dnf repomanage --old --keep=$old . | tee $TMP
-repomanage --old --keep=$old . 2>/dev/null | tee $TMP
-LST=$(cat $TMP)
+	# use old deprecated yum command see https://bugzilla.redhat.com/1537981
+	#dnf repomanage --old --keep=$old . | tee $TMP
+	repomanage --old --keep=$old . 2>/dev/null | tee $TMP
+	LST=$(cat $TMP)
 
-if [ -z "$LST" ]
-then	echo OK.
-else	mv $LST /data/rpms/old/
+	if [ -z "$LST" ]
+	then	echo OK.
+	else	mv $LST /data/rpms/old/
+	fi
 fi
 
 cache=/home/rpmbuild/site/rpms/.createrepocache/$nom
 mkdir -p $cache
 check=sha256
-if [ "$dis" == "fedora" -a "$ver" -ge 99 ]; then
-  # See: https://bugzilla.redhat.com/show_bug.cgi?id=1577747
-  echo "+ Nettoyage"
-  rm -rf repodata
+#if [ "$dis" == "fedora" -a "$ver" -ge 99 ]; then
+if true; then
+  cleanoldmeta repodata
   echo "+ Génération repodata (createrepo_c, $check)"
   createrepo_c --workers 4 		     \
                --cachedir $cache 	 \
-- 
cgit