From 8d0d962447602473ab36ad8bfb5c78ad09a78de9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 11 Sep 2020 15:03:11 +0200
Subject: build helper for php 8

---
 buildfct  | 94 +++++++++++++++++++++++++++++++++++----------------------------
 getmock   | 40 ++++++++++++++++-----------
 mkallrepo |  4 +--
 3 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/buildfct b/buildfct
index ccad0a5..41a6df8 100644
--- a/buildfct
+++ b/buildfct
@@ -22,6 +22,7 @@ alias mockfc31x="                mock --configdir=$mocketc -r fc31x
 alias mockfc31xd="               mock --configdir=$mocketc -r fc31xd              rebuild "
 alias mockfc31xr="               mock --configdir=$mocketc -r fc31xr              rebuild "
 alias mockfc31x74="              mock --configdir=$mocketc -r fc31x74             rebuild "
+alias mockfc31x80="              mock --configdir=$mocketc -r fc31x80             rebuild "
 alias mockfc31xscl56="           mock --configdir=$mocketc -r fc31xscl56          rebuild "
 alias mockfc31xscl70="           mock --configdir=$mocketc -r fc31xscl70          rebuild "
 alias mockfc31xscl71="           mock --configdir=$mocketc -r fc31xscl71          rebuild "
@@ -33,6 +34,7 @@ alias mockfc31xscl80="           mock --configdir=$mocketc -r fc31xscl80
 alias mockfc32x="                mock --configdir=$mocketc -r fc32x               rebuild "
 alias mockfc32xd="               mock --configdir=$mocketc -r fc32xd              rebuild "
 alias mockfc32xr="               mock --configdir=$mocketc -r fc32xr              rebuild "
+alias mockfc32x80="              mock --configdir=$mocketc -r fc32x80             rebuild "
 alias mockfc32xscl56="           mock --configdir=$mocketc -r fc32xscl56          rebuild "
 alias mockfc32xscl70="           mock --configdir=$mocketc -r fc32xscl70          rebuild "
 alias mockfc32xscl71="           mock --configdir=$mocketc -r fc32xscl71          rebuild "
@@ -44,6 +46,7 @@ alias mockfc32xscl80="           mock --configdir=$mocketc -r fc32xscl80
 alias mockfc33x="                mock --configdir=$mocketc -r fc33x               rebuild "
 alias mockfc33xd="               mock --configdir=$mocketc -r fc33xd              rebuild "
 alias mockfc33xr="               mock --configdir=$mocketc -r fc33xr              rebuild "
+alias mockfc33x80="              mock --configdir=$mocketc -r fc33x80             rebuild "
 alias mockfc33xscl56="           mock --configdir=$mocketc -r fc33xscl56          rebuild "
 alias mockfc33xscl70="           mock --configdir=$mocketc -r fc33xscl70          rebuild "
 alias mockfc33xscl71="           mock --configdir=$mocketc -r fc33xscl71          rebuild "
@@ -88,6 +91,7 @@ alias mockel7x71="             mock --configdir=$mocketc -r el7x71             r
 alias mockel7x72="             mock --configdir=$mocketc -r el7x72             rebuild "
 alias mockel7x73="             mock --configdir=$mocketc -r el7x73             rebuild "
 alias mockel7x74="             mock --configdir=$mocketc -r el7x74             rebuild "
+alias mockel7x80="             mock --configdir=$mocketc -r el7x80             rebuild "
 alias mockel7xscl54="          mock --configdir=$mocketc -r el7xscl54          rebuild "
 alias mockel7xscl55="          mock --configdir=$mocketc -r el7xscl55          rebuild "
 alias mockel7xscl56="          mock --configdir=$mocketc -r el7xscl56          rebuild "
@@ -104,6 +108,7 @@ alias mockel8xp="              mock --configdir=$mocketc -r el8xp              r
 alias mockel8x72="             mock --configdir=$mocketc -r el8x72             rebuild "
 alias mockel8x73="             mock --configdir=$mocketc -r el8x73             rebuild "
 alias mockel8x74="             mock --configdir=$mocketc -r el8x74             rebuild "
+alias mockel8x80="             mock --configdir=$mocketc -r el8x80             rebuild "
 alias mockel8xscl56="          mock --configdir=$mocketc -r el8xscl56          rebuild "
 alias mockel8xscl70="          mock --configdir=$mocketc -r el8xscl70          rebuild "
 alias mockel8xscl71="          mock --configdir=$mocketc -r el8xscl71          rebuild "
@@ -128,11 +133,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 30
-  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 !"
-  done
   echo -n "$(date +%X) el6  "
   setarch i686    mock $quiet --configdir=$mocketc -r el6i    --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   date +%X
@@ -151,11 +151,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 30
-  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 !"
-  done
+  echo "Nothing."
 else
   echo "file not found '$1'"
 fi
@@ -171,11 +167,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 30
-  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 !"
-  done
+  echo "Nothing."
 else
   echo "file not found '$1'"
 fi
@@ -328,19 +320,13 @@ fi
 # Build All distribution / version / 32bits for remi/remi-php74
 mock74i()
 {
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
+echo "Nothing."
+}
 
-if [ -f "$1" ]; then
-  echo -n "$(date +%X) 74 fc30 "
-  setarch i686    mock $quiet --configdir=$mocketc -r fc30i74 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
-  date +%X
-else
-  echo "file not found '$1'"
-fi
+# Build All distribution / version / 32bits for remi/remi-php80
+mock74i()
+{
+echo "Nothing."
 }
 
 # Build all distribution / version / 32bits for remi-test
@@ -371,7 +357,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 32 30 33
+  for i in 31 32 33
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -397,7 +383,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 30 32 33
+  for i in 31 32 33
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xr rebuild $1 && echo " Ok." || echo " Error !"
@@ -423,7 +409,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 30 32
+  for i in 31 32 33
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -487,7 +473,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 32 31 30 33
+  for i in 32 31 33
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x    rebuild $1 && echo "$(date +%X) (7x) fc$i  Ok." || echo "fc$1 Error !")&
@@ -520,7 +506,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 32 31 30 33
+  for i in 32 31 33
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x   rebuild $1 && echo "$(date +%X) (7x) fc$i  Ok." || echo "fc$1 Error !")&
@@ -553,7 +539,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 31 30
+  for i in 31
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x    rebuild $1 && echo "$(date +%X) (72) fc$i  Ok." || echo "fc$1 Error !")&
@@ -734,7 +720,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 30
+  for i in 31
   do
     echo -n "$(date +%X) 74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild $1 && echo " Ok." || echo " Error !"
@@ -750,6 +736,32 @@ else
 fi
 }
 
+# Build All distribution / version / 64bits for remi/remi-php74
+mock80x()
+{
+quiet=""
+if [ "$1" = "-q" ]; then
+    quiet="--quiet"
+    shift
+fi
+
+if [ -f "$1" ]; then
+  for i in 31 32 33
+  do
+    echo -n "$(date +%X) 80 fc$i "
+    mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild $1 && echo " Ok." || echo " Error !"
+  done
+  for i in 8 7
+  do
+    echo -n "$(date +%X) 80 el$i  "
+    mock $quiet --configdir=$mocketc -r el${i}x80 rebuild $1 && echo " Ok." || echo " Error !"
+  done
+  date +%X
+else
+  echo "file not found '$1'"
+fi
+}
+
 # Build All distribution / version / 64bits for remi/scl-php80
 mockscl80x()
 {
@@ -776,7 +788,7 @@ else
 fi
 }
 
-# Build All distribution / version / 64bits for remi/scl-php74
+# Build All distribution / version / 64bits for remi/scl-php80
 mockscl74x()
 {
 quiet=""
@@ -786,7 +798,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 32 30 33
+  for i in 31 32 33
   do
     echo -n "$(date +%X) scl74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild $1 && echo " Ok." || echo " Error !"
@@ -812,7 +824,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 32 30 33
+  for i in 31 32 33
   do
     echo -n "$(date +%X) scl73 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl73 rebuild $1 && echo " Ok." || echo " Error !"
@@ -838,7 +850,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 30 32 33
+  for i in 31 32 33
   do
     echo -n "$(date +%X) scl72 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl72 rebuild $1 && echo " Ok." || echo " Error !"
@@ -864,7 +876,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 30 32
+  for i in 31 33 32
   do
     echo -n "$(date +%X) scl71 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild $1 && echo " Ok." || echo " Error !"
@@ -890,7 +902,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 32 33 30
+  for i in 31 32 33
   do
     echo -n "$(date +%X) scl70 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !"
@@ -916,7 +928,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 32 30 33
+  for i in 31 32 33
   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 d779abf..9878657 100755
--- a/getmock
+++ b/getmock
@@ -72,6 +72,16 @@ el8x74)
 	fi
 	type=enterprise
 	;;
+el8x80)
+	dep=8
+    if [ "$2" == "php80" -o "$2" == "test80" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php80
+	else	rep=${2}80
+	fi
+	type=enterprise
+	;;
 el*)	dep=${dep#el}
 	type=enterprise
 	;;
@@ -283,10 +293,6 @@ if [ $1 = devs -o $1 = dev ]; then
 fi
 
 if [ $1 = all ]; then
-	for i in 30
-	do
-		getOneMock fc${i}i $opt
-	done
 	for i in 6
 	do
 		getOneMock el${i}i $opt
@@ -348,11 +354,13 @@ elif [ $1 = all73 ]; then
 elif [ $1 = all74 ]; then
 	[ $opt = remi ] && opt=php74
 	[ $opt = test ] && opt=test74
-	for n in 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*'
+
+elif [ $1 = all80 ]; then
+	[ $opt = remi ] && opt=php74
+	[ $opt = test ] && opt=test74
 		getOneMock fc31x   $opt '*7.4*'
 		getOneMock el7x    $opt '*7.4*'
 		getOneMock el8x74  $opt '*7.4*'
@@ -379,7 +387,7 @@ elif [ $1 = for55 ]; then
 	done
 
 elif [ $1 = allx ]; then
-	for i in 30 31 32 33
+	for i in 31 32 33
 	do
 		getOneMock fc${i}x $opt
 	done
@@ -401,7 +409,7 @@ elif [ $1 = scl55 ]; then
 	done
 
 elif [ $1 = scl56 ]; then
-	for i in 33 30 31 32
+	for i in 33 31 32
 	do
 		getOneMock scl56fc${i}x $opt
 	done
@@ -411,7 +419,7 @@ elif [ $1 = scl56 ]; then
 	done
 
 elif [ $1 = scl70 ]; then
-	for i in 30 31 32 33
+	for i in 31 32 33
 	do
 		getOneMock scl70fc${i}x $opt
 	done
@@ -421,7 +429,7 @@ elif [ $1 = scl70 ]; then
 	done
 
 elif [ $1 = scl71 ]; then
-	for i in 30 31 32 33
+	for i in 31 32 33
 	do
 		getOneMock scl71fc${i}x $opt
 	done
@@ -441,7 +449,7 @@ elif [ $1 = scl80 ]; then
 	done
 
 elif [ $1 = scl74 ]; then
-	for i in 30 31 32 33
+	for i in 31 32 33
 	do
 		getOneMock scl74fc${i}x $opt
 	done
@@ -451,7 +459,7 @@ elif [ $1 = scl74 ]; then
 	done
 
 elif [ $1 = scl73 ]; then
-	for i in 30 31 32 33
+	for i in 31 32 33
 	do
 		getOneMock scl73fc${i}x $opt
 	done
@@ -461,7 +469,7 @@ elif [ $1 = scl73 ]; then
 	done
 
 elif [ $1 = scl72 ]; then
-	for i in 30 31 32 33
+	for i in 31 32 33
 	do
 		getOneMock scl72fc${i}x $opt
 	done
diff --git a/mkallrepo b/mkallrepo
index 8e0f9b9..e339da4 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -10,7 +10,7 @@ TMPSIG2020=$(mktemp -t XXXXXXXX.2020)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{30,31,32,33}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{31,32,33}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 
@@ -92,7 +92,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{30,31,32,33}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{31,32,33}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 
-- 
cgit