From b1fd573ef83c1cca7ba7d46cd033a9f56139b30e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 27 Sep 2019 09:26:35 +0200
Subject: drop f31 32-bit and add helper for EL8 with epel-playground

---
 buildfct | 14 +++++---------
 getmock  |  5 +++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/buildfct b/buildfct
index f48c21a..5068b9a 100644
--- a/buildfct
+++ b/buildfct
@@ -33,9 +33,6 @@ alias mockfc30xscl72="           mock --configdir=$mocketc -r fc30xscl72
 alias mockfc30xscl73="           mock --configdir=$mocketc -r fc30xscl73          rebuild "
 alias mockfc30xscl74="           mock --configdir=$mocketc -r fc30xscl74          rebuild "
 
-alias mockfc31i="  setarch i686  mock --configdir=$mocketc -r fc31i   --arch i686 rebuild "
-alias mockfc31ir=" setarch i686  mock --configdir=$mocketc -r fc31ir  --arch i686 rebuild "
-alias mockfc31i74="setarch i686  mock --configdir=$mocketc -r fc31i74 --arch i686 rebuild "
 alias mockfc31x="                mock --configdir=$mocketc -r fc31x               rebuild "
 alias mockfc31xr="               mock --configdir=$mocketc -r fc31xr              rebuild "
 alias mockfc31x74="              mock --configdir=$mocketc -r fc31x74             rebuild "
@@ -93,6 +90,7 @@ alias mockel7xscl74="          mock --configdir=$mocketc -r el7xscl74          r
 
 alias mockel8x="               mock --configdir=$mocketc -r el8x               rebuild "
 alias mockel8xr="              mock --configdir=$mocketc -r el8xr              rebuild "
+alias mockel8xp="              mock --configdir=$mocketc -r el8xp              rebuild "
 alias mockel8x72="             mock --configdir=$mocketc -r el8x72             rebuild "
 alias mockel8x73="             mock --configdir=$mocketc -r el8x73             rebuild "
 alias mockel8x74="             mock --configdir=$mocketc -r el8x74             rebuild "
@@ -116,7 +114,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 30 29
+  for i in 30 29
   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 !"
@@ -139,7 +137,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 30 29
+  for i in 30 29
   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 !"
@@ -159,7 +157,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 30 29
+  for i in 30 29
   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 !"
@@ -329,8 +327,6 @@ if [ -f "$1" ]; then
   setarch i686    mock $quiet --configdir=$mocketc -r fc29i74 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) 74 fc30 "
   setarch i686    mock $quiet --configdir=$mocketc -r fc30i74 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
-  echo -n "$(date +%X) 74 fc31 "
-  setarch i686    mock $quiet --configdir=$mocketc -r fc31i74 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   date +%X
 else
   echo "file not found '$1'"
@@ -396,7 +392,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xr rebuild $1 && echo " Ok." || echo " Error !"
   done
-  for i in 7
+  for i in 7 8
   do
     echo -n "$(date +%X) el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xr rebuild $1 && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index ebd3515..577d851 100755
--- a/getmock
+++ b/getmock
@@ -270,7 +270,7 @@ if [ $1 = devs -o $1 = dev ]; then
 fi
 
 if [ $1 = all ]; then
-	for i in 29 30 31
+	for i in 29 30
 	do
 		getOneMock fc${i}i $opt
 	done
@@ -340,11 +340,12 @@ elif [ $1 = all73 ]; then
 elif [ $1 = all74 ]; then
 	[ $opt = remi ] && opt=php74
 	[ $opt = test ] && opt=test74
-	for n in 29 30 31
+	for n in 29 30
 	do
 		getOneMock fc${n}i $opt '*7.4*'
 		getOneMock fc${n}x $opt '*7.4*'
 	done
+		getOneMock fc31x   $opt '*7.4*'
 		getOneMock el7x    $opt '*7.4*'
 		getOneMock el8x74  $opt '*7.4*'
 
-- 
cgit