From 491be9cbf68b47e4e23c166179d8ed7e7fb87b2c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 2 Jul 2024 12:04:44 +0200
Subject: EL-7 is EOL

---
 buildfct  | 267 +++++--------------------------------------------------
 getmock   |  71 +++------------
 mkmodular | 301 --------------------------------------------------------------
 mockit    |   8 +-
 4 files changed, 36 insertions(+), 611 deletions(-)

diff --git a/buildfct b/buildfct
index c175cb0..331a12b 100644
--- a/buildfct
+++ b/buildfct
@@ -239,27 +239,6 @@ alias mockepel874="            mock --configdir=$mocketc -r epel874            r
 alias mockdevi="setarch i686 mock -r fedora-devel-i386   rebuild "
 alias mockdevx="             mock -r fedora-devel-x86_64 rebuild "
 
-# Build All distribution / version / 64bits for remi
-mockallx()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
-
-if [ -f "$1" ]; then
-  for i in 7
-  do
-    echo -n "$(date +%X) el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}x rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
 # Build All distribution / version / 64bits for remi with RPMFusion
 mockallxr()
 {
@@ -270,7 +249,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 7 8
+  for i in 8
   do
     echo -n "$(date +%X) el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xr rebuild "$@" && echo " Ok." || echo " Error !"
@@ -281,48 +260,6 @@ else
 fi
 }
 
-# Build All distribution (PHP 5) / version / 64bits for remi
-mock5x()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
-
-if [ -f "$1" ]; then
-  for i in 7
-  do
-    echo -n "$(date +%X) el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}x rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
-# Build enterprise / version / 64bits for remi (php 5.4)
-mock54x()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
-
-if [ -f "$1" ]; then
-  for i in 7
-  do
-    echo -n "$(date +%X) el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}x rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
 # Build All distribution / version / noarch for remi using PHP >= 8.0
 mock80n()
 {
@@ -340,9 +277,6 @@ if [ -f "$1" ]; then
     (mock $quiet --configdir=$mocketc -r fc${i}x   rebuild "$@" && echo "$(date +%X) (8x) fc$i  Ok." || echo "fc$1 Error !")&
     pids="$pids $!"
   done
-    echo -n ""
-    (mock $quiet --configdir=$mocketc -r el7x --enablerepo=remi-php80 rebuild "$@" && echo "$(date +%X) (74) el7   Ok." || echo "el7  Error !")&
-    pids="$pids $!"
     echo -n ""
     (mock $quiet --configdir=$mocketc -r el8x      rebuild "$@" && echo "$(date +%X) (74) el8   Ok." || echo "el8  Error !")&
     pids="$pids $!"
@@ -377,9 +311,6 @@ if [ -f "$1" ]; then
     (mock $quiet --configdir=$mocketc -r fc38x     rebuild "$@" && echo "$(date +%X) (82) fc38  Ok." || echo "fc38 Error !")&
     pids="$pids $!"
     echo -n ""
-    (mock $quiet --configdir=$mocketc -r el7x --enablerepo=remi-php81 rebuild "$@" && echo "$(date +%X) (81) el7   Ok." || echo "el7  Error !")&
-    pids="$pids $!"
-    echo -n ""
     (mock $quiet --configdir=$mocketc -r el8n81    rebuild "$@" && echo "$(date +%X) (81) el8   Ok." || echo "el8  Error !")&
     pids="$pids $!"
     echo -n ""
@@ -413,9 +344,6 @@ if [ -f "$1" ]; then
     (mock $quiet --configdir=$mocketc -r fc38x     rebuild "$@" && echo "$(date +%X) (82) fc38  Ok." || echo "fc38 Error !")&
     pids="$pids $!"
     echo -n ""
-    (mock $quiet --configdir=$mocketc -r el7x --enablerepo=remi-php82 rebuild "$@" && echo "$(date +%X) (81) el7   Ok." || echo "el7  Error !")&
-    pids="$pids $!"
-    echo -n ""
     (mock $quiet --configdir=$mocketc -r el8n82    rebuild "$@" && echo "$(date +%X) (81) el8   Ok." || echo "el8  Error !")&
     pids="$pids $!"
     echo -n ""
@@ -428,27 +356,6 @@ else
 fi
 }
 
-# Build All distribution / version / 64bits for remi/remi-php55
-mock55x()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
-
-if [ -f "$1" ]; then
-  for i in 7
-  do
-    echo -n "$(date +%X) 55 el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}x55 rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
 # Build All EL distributions
 mockel()
 {
@@ -459,7 +366,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 8 7
+  for i in 8
   do
     echo -n "$(date +%X) el${i}x "
     mock $quiet --configdir=$mocketc -r el${i}x rebuild "$@" && echo " Ok." || echo " Error !"
@@ -470,69 +377,6 @@ else
 fi
 }
 
-# Build All distribution / version / 64bits for remi/remi-php56
-mock56x()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
-
-if [ -f "$1" ]; then
-  for i in 7
-  do
-    echo -n "$(date +%X) 56 el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}x56 rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
-# Build All distribution / version / 64bits for remi/remi-php70
-mock70x()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
-
-if [ -f "$1" ]; then
-  for i in 7
-  do
-    echo -n "$(date +%X) 70 el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}x70 rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
-# Build All distribution / version / 64bits for remi/remi-php71
-mock71x()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
-
-if [ -f "$1" ]; then
-  for i in 7
-  do
-    echo -n "$(date +%X) 71 el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}x71 rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
 # Build All distribution / version / 64bits for remi/remi-php72
 mock72x()
 {
@@ -543,7 +387,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 8 7
+  for i in 8
   do
     echo -n "$(date +%X) 72 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x72 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -564,7 +408,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 8 7
+  for i in 8
   do
     echo -n "$(date +%X) 73 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x73 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -590,7 +434,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) 74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 9 8 7
+  for i in 9 8
   do
     echo -n "$(date +%X) 74 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -616,7 +460,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) scl83 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 7 8 9
+  for i in 8 9
   do
     echo -n "$(date +%X) scl83 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -642,7 +486,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) scl82 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 7 8 9
+  for i in 8 9
   do
     echo -n "$(date +%X) scl82 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -668,7 +512,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) scl81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 7 8 9
+  for i in 8 9
   do
     echo -n "$(date +%X) scl81 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -697,8 +541,6 @@ if [ -f "$1" ]; then
   mock $quiet --configdir=$mocketc -r el9xr60  rebuild "$@" && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) r60 el8 "
   mock $quiet --configdir=$mocketc -r el8xr60  rebuild "$@" && echo " Ok." || echo " Error !"
-  echo -n "$(date +%X) r60 el7 "
-  mock $quiet --configdir=$mocketc -r el7x     rebuild "$@" && echo " Ok." || echo " Error !"
   date +%X
 else
   echo "file not found '$1'"
@@ -723,8 +565,6 @@ if [ -f "$1" ]; then
   mock $quiet --configdir=$mocketc -r el9xr62  rebuild "$@" && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) r62 el8 "
   mock $quiet --configdir=$mocketc -r el8xr62  rebuild "$@" && echo " Ok." || echo " Error !"
-  echo -n "$(date +%X) r62 el7 "
-  mock $quiet --configdir=$mocketc -r el7x     rebuild "$@" && echo " Ok." || echo " Error !"
   date +%X
 else
   echo "file not found '$1'"
@@ -749,8 +589,6 @@ if [ -f "$1" ]; then
   mock $quiet --configdir=$mocketc -r el9xr72  rebuild "$@" && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) r72 el8 "
   mock $quiet --configdir=$mocketc -r el8xr72  rebuild "$@" && echo " Ok." || echo " Error !"
-  echo -n "$(date +%X) r72 el7 "
-  mock $quiet --configdir=$mocketc -r el7x     rebuild "$@" && echo " Ok." || echo " Error !"
   date +%X
 else
   echo "file not found '$1'"
@@ -775,8 +613,6 @@ if [ -f "$1" ]; then
   mock $quiet --configdir=$mocketc -r el9xr70  rebuild "$@" && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) r70 el8 "
   mock $quiet --configdir=$mocketc -r el8xr70  rebuild "$@" && echo " Ok." || echo " Error !"
-  echo -n "$(date +%X) r70 el7 "
-  mock $quiet --configdir=$mocketc -r el7x     rebuild "$@" && echo " Ok." || echo " Error !"
   date +%X
 else
   echo "file not found '$1'"
@@ -798,7 +634,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) 83 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 8 9 7
+  for i in 8 9
   do
     echo -n "$(date +%X) 83 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x83 rebuild "$@"&& echo " Ok." || echo " Error !"
@@ -819,7 +655,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 8 9 7
+  for i in 8 9
   do
     echo -n "$(date +%X) 83 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x83 rebuild "$@"&& echo " Ok." || echo " Error !"
@@ -866,7 +702,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) 82 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 8 9 7
+  for i in 8 9
   do
     echo -n "$(date +%X) 82 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x82 rebuild "$@"&& echo " Ok." || echo " Error !"
@@ -892,7 +728,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) 81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 8 9 7
+  for i in 8 9
   do
     echo -n "$(date +%X) 81 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x81 rebuild "$@"&& echo " Ok." || echo " Error !"
@@ -918,7 +754,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) 80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 9 8 7
+  for i in 9 8
   do
     echo -n "$(date +%X) 80 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x80 rebuild "$@"&& echo " Ok." || echo " Error !"
@@ -944,7 +780,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) scl80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 9 7 8
+  for i in 9 8
   do
     echo -n "$(date +%X) scl80 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -970,7 +806,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) scl74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 7 9 8
+  for i in 9 8
   do
     echo -n "$(date +%X) scl74 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -991,7 +827,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 7 8
+  for i in 8
   do
     echo -n "$(date +%X) scl73 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl73 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -1012,7 +848,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 8 7
+  for i in 8
   do
     echo -n "$(date +%X) scl72 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl72 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -1033,7 +869,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 8 7
+  for i in 8
   do
     echo -n "$(date +%X) scl71 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl71 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -1054,7 +890,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 8 7
+  for i in 8
   do
     echo -n "$(date +%X) scl70 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl70 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -1075,7 +911,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 8 7
+  for i in 8
   do
     echo -n "$(date +%X) scl56 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl56 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -1086,67 +922,4 @@ else
 fi
 }
 
-# Build All distribution / version / 64bits for remi/scl-php55
-mockscl55x()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
-
-if [ -f "$1" ]; then
-  for i in 7
-  do
-    echo -n "$(date +%X) scl55 el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}xscl55 rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
-# Build All distribution / version / 64bits for remi/scl-php54
-mockscl54x()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
-
-if [ -f "$1" ]; then
-  for i in 7
-  do
-    echo -n "$(date +%X) scl54 el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}xscl54 rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
-# Build All distribution / version / 64bits for remi-test
-mockallxt()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
-
-if [ -f "$1" ]; then
-  for i in 7
-  do
-    echo -n "$(date +%X) test-el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}xt rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
 
diff --git a/getmock b/getmock
index e695db8..c15986f 100755
--- a/getmock
+++ b/getmock
@@ -465,14 +465,12 @@ elif [ $1 = all71 ]; then
 elif [ $1 = all72 ]; then
 	[ $opt = remi ] && opt=php72
 	[ $opt = test ] && opt=test72
-		getOneMock el7x72  $opt '*7.2*'
 		getOneMock el8x72  $opt '*7.2*'
 		getOneMock el8a72  $opt '*7.2*'
 
 elif [ $1 = all73 ]; then
 	[ $opt = remi ] && opt=php73
 	[ $opt = test ] && opt=test73
-		getOneMock el7x73  $opt '*7.3*'
 		getOneMock el8x73  $opt '*7.3*'
 		getOneMock el8a73  $opt '*7.3*'
 
@@ -484,7 +482,6 @@ elif [ $1 = all74 ]; then
 		getOneMock fc39a74 $opt '*7.4*'
 		getOneMock fc40x74 $opt '*7.4*'
 		getOneMock fc40a74 $opt '*7.4*'
-		getOneMock el7x74  $opt '*7.4*'
 		getOneMock el8x74  $opt '*7.4*'
 		getOneMock el8a74  $opt '*7.4*'
 		getOneMock el9x74  $opt '*7.4*'
@@ -498,7 +495,6 @@ elif [ $1 = all80 ]; then
 		getOneMock fc39a80 $opt '*8.0*'
 		getOneMock fc40x80 $opt '*8.0*'
 		getOneMock fc40a80 $opt '*8.0*'
-		getOneMock el7x80  $opt '*8.0*'
 		getOneMock el8x80  $opt '*8.0*'
 		getOneMock el8a80  $opt '*8.0*'
 		getOneMock el9x80  $opt '*8.0*'
@@ -512,7 +508,6 @@ elif [ $1 = all81 ]; then
 		getOneMock fc39a81 $opt '*8.1*'
 		getOneMock fc40x81 $opt '*8.1*'
 		getOneMock fc40a81 $opt '*8.1*'
-		getOneMock el7x81  $opt '*8.1*'
 		getOneMock el8x81  $opt '*8.1*'
 		getOneMock el8a81  $opt '*8.1*'
 		getOneMock el9x81  $opt '*8.1*'
@@ -526,7 +521,6 @@ elif [ $1 = all82 ]; then
 		getOneMock fc39a82 $opt '*8.2*'
 		getOneMock fc40x82 $opt '*8.2*'
 		getOneMock fc40a82 $opt '*8.2*'
-		getOneMock el7x82  $opt '*8.2*'
 		getOneMock el8x82  $opt '*8.2*'
 		getOneMock el8a82  $opt '*8.2*'
 		getOneMock el9x82  $opt '*8.2*'
@@ -540,15 +534,12 @@ elif [ $1 = all83 ]; then
 		getOneMock fc39a83 $opt '*8.3*'
 		getOneMock fc40x83 $opt '*8.3*'
 		getOneMock fc40a83 $opt '*8.3*'
-		getOneMock el7x83  $opt '*8.3*'
 		getOneMock el8x83  $opt '*8.3*'
 		getOneMock el8a83  $opt '*8.3*'
 		getOneMock el9x83  $opt '*8.3*'
 		getOneMock el9a83  $opt '*8.3*'
 
 elif [ $1 = allr60 ]; then
-	opt=remi
-	getOneMock el7x  $opt '*6.0*'
 	opt=redis60
 	getOneMock fc38x $opt '*6.0*'
 	getOneMock fc39x $opt '*6.0*'
@@ -561,8 +552,6 @@ elif [ $1 = allr60 ]; then
 	getOneMock el9a  $opt '*6.0*'
 
 elif [ $1 = allr62 ]; then
-	opt=remi
-	getOneMock el7x  $opt '*6.2*'
 	opt=redis62
 	getOneMock fc38x $opt '*6.2*'
 	getOneMock fc39x $opt '*6.2*'
@@ -575,8 +564,6 @@ elif [ $1 = allr62 ]; then
 	getOneMock el9a  $opt '*6.2*'
 
 elif [ $1 = allr70 ]; then
-	opt=remi
-	getOneMock el7x  $opt '*7.0*'
 	opt=redis70
 	getOneMock fc38x $opt '*7.0*'
 	getOneMock fc39x $opt '*7.0*'
@@ -589,8 +576,6 @@ elif [ $1 = allr70 ]; then
 	getOneMock el9a  $opt '*7.0*'
 
 elif [ $1 = allr72 ]; then
-	opt=remi
-	getOneMock el7x  $opt '*7.2*'
 	opt=redis72
 	getOneMock fc38x $opt '*7.2*'
 	getOneMock fc39x $opt '*7.2*'
@@ -604,8 +589,8 @@ elif [ $1 = allr72 ]; then
 
 elif [ $1 = allm ]; then
 	opt=remi
-	getOneMock el7x  $opt '*1.6*'
 	getOneMock el8x  $opt '*1.6*'
+	getOneMock el8a  $opt '*1.6*'
 	opt=memcached
 	getOneMock fc38x $opt '*1.6*'
 	getOneMock fc39x $opt '*1.6*'
@@ -615,28 +600,12 @@ elif [ $1 = allm ]; then
 	getOneMock el9x  $opt '*1.6*'
 	getOneMock el9a  $opt '*1.6*'
 
-elif [ $1 = all54 ]; then
-	n=7
-		getOneMock el${n}x remi '*5.4*'
-
-elif [ $1 = for56 ]; then
-	for i in 7
-	do
-		getOneMock el${i}x test
-	done
-
-elif [ $1 = for55 ]; then
-	for i in 7
-	do
-		getOneMock el${i}x test
-	done
-
 elif [ $1 = allx ]; then
 	for i in 38 39 40
 	do
 		getOneMock fc${i}x $opt
 	done
-	for i in 7 8 9
+	for i in 8 9
 	do
 		getOneMock el${i}x $opt
 	done
@@ -651,38 +620,26 @@ elif [ $1 = alla ]; then
 		getOneMock el${i}a $opt
 	done
 
-elif [ $1 = scl54 ]; then
-	for i in 7
-	do
-		getOneMock scl54el${i}x $opt
-	done
-
-elif [ $1 = scl55 ]; then
-	for i in 7
-	do
-		getOneMock scl55el${i}x $opt
-	done
-
 elif [ $1 = scl56 ]; then
-	for i in 7 8
+	for i in 8
 	do
 		getOneMock scl56el${i}x $opt
 	done
 
 elif [ $1 = scl70 ]; then
-	for i in 7 8
+	for i in 8
 	do
 		getOneMock scl70el${i}x $opt
 	done
 
 elif [ $1 = scl71 ]; then
-	for i in 7 8
+	for i in 8
 	do
 		getOneMock scl71el${i}x $opt
 	done
 
 elif [ $1 = scl83 ]; then
-	for i in fc38 fc39 fc40 el7 el8 el9
+	for i in fc38 fc39 fc40 el8 el9
 	do
 		getOneMock scl83${i}x $opt
 	done
@@ -698,7 +655,7 @@ elif [ $1 = scl82 ]; then
 	done
 		getOneMock scl82fc39a   $opt
 		getOneMock scl82fc40a   $opt
-	for i in 7 8 9
+	for i in 8 9
 	do
 		getOneMock scl82el${i}x $opt
 	done
@@ -712,7 +669,7 @@ elif [ $1 = scl81 ]; then
 	done
 		getOneMock scl81fc39a   $opt
 		getOneMock scl81fc40a   $opt
-	for i in 7 8 9
+	for i in 8 9
 	do
 		getOneMock scl81el${i}x $opt
 	done
@@ -726,7 +683,7 @@ elif [ $1 = scl80 ]; then
 	done
 		getOneMock scl80fc39a   $opt
 		getOneMock scl80fc40a   $opt
-	for i in 7 8 9
+	for i in 8 9
 	do
 		getOneMock scl80el${i}x $opt
 	done
@@ -740,7 +697,7 @@ elif [ $1 = scl74 ]; then
 	done
 		getOneMock scl74fc39a   $opt
 		getOneMock scl74fc40a   $opt
-	for i in 7 8 9
+	for i in 8 9
 	do
 		getOneMock scl74el${i}x $opt
 	done
@@ -748,14 +705,14 @@ elif [ $1 = scl74 ]; then
 		getOneMock scl74el9a    $opt
 
 elif [ $1 = scl73 ]; then
-	for i in 7 8
+	for i in 8
 	do
 		getOneMock scl73el${i}x $opt
 	done
 		getOneMock scl73el8a    $opt
 
 elif [ $1 = scl72 ]; then
-	for i in 7 8
+	for i in 8
 	do
 		getOneMock scl72el${i}x $opt
 	done
@@ -763,8 +720,8 @@ elif [ $1 = scl72 ]; then
 
 elif [ $1 = allphp ]; then
 	LOG=$(mktemp out.XXXXXXXXXX)
-	MOD="all54 all55 all56 all70 all71 all72 all73 all74 all80 all81 all82 all83"
-	SCL="scl54 scl55 scl56 scl70 scl71 scl72 scl73 scl74 scl80 scl81 scl82 scl83"
+	MOD="all72 all73 all74 all80 all81 all82 all83"
+	SCL="scl56 scl70 scl71 scl72 scl73 scl74 scl80 scl81 scl82 scl83"
 	for i in $SCL $MOD
 	do	$0 $opt $i | tee $LOG
 		if grep -q '64\.rpm' $LOG && grep -q 'Aucun' $LOG
diff --git a/mkmodular b/mkmodular
index e6c71b4..412f0ad 100755
--- a/mkmodular
+++ b/mkmodular
@@ -388,265 +388,6 @@ rename($data, "$data.$arch");
 exec("gpg --armor --detach-sign --default-key \"$GPG_NAME\" --homedir \"$GPG_PATH\" repodata/repomd.xml");
 chdir($old);
 }
-/*
-if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) {
-	$dest = 'fedora/33/modular/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f33'];
-	$mod .= genModule('fedora/33/remi/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/33/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/33/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']);
-	createRepo($dest, $mod);
-}
-if (in_array('f33', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
-	$dest = 'fedora/33/modular-test/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f33'];
-	$mod .= genModule('fedora/33/test/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/33/test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/33/test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
-	createRepo($dest, $mod);
-}
-
-if (count($_SERVER['argv']) < 2 || in_array('f34', $_SERVER['argv'])) {
-	$dest = 'fedora/34/modular/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f34'];
-	$mod .= genModule('fedora/34/remi/x86_64',   $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/34/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/34/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']);
-	createRepo($dest, $mod);
-
-	$dest = 'fedora/34/debug-modular/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f34'];
-	$mod .= genModule('fedora/34/debug-remi/x86_64',   $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/34/debug-php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/34/debug-php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
-	createRepo($dest, $mod);
-}
-if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
-	$dest = 'fedora/34/modular-test/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f34'];
-	$mod .= genModule('fedora/34/test/x86_64',   $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/34/test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/34/test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
-	createRepo($dest, $mod);
-
-	$dest = 'fedora/34/debug-modular-test/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f34'];
-	$mod .= genModule('fedora/34/debug-test/x86_64',   $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/34/debug-test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/34/debug-test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
-	createRepo($dest, $mod);
-}
-
-if (count($_SERVER['argv']) < 2 || in_array('f35', $_SERVER['argv'])) {
-	$dest = 'fedora/35/modular/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f35'];
-	$mod .= genModule('fedora/35/php74/x86_64',  $dest, '*rpm',          '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/remi/x86_64',   $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/php82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2']);
-	createRepo($dest, $mod);
-
-	$dest = 'fedora/35/debug-modular/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f35'];
-	$mod .= genModule('fedora/35/debug-php74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/debug-remi/x86_64',   $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/debug-php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/debug-php82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
-	createRepo($dest, $mod);
-}
-if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
-	$dest = 'fedora/35/modular-test/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f35'];
-	$mod .= genModule('fedora/35/test74/x86_64', $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/test/x86_64',   $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/test82/x86_64', $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
-	createRepo($dest, $mod);
-
-	$dest = 'fedora/35/debug-modular-test/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f35'];
-	$mod .= genModule('fedora/35/debug-test74/x86_64', $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/debug-test/x86_64',   $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/debug-test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/debug-test82/x86_64', $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
-	createRepo($dest, $mod);
-}
-
-if (count($_SERVER['argv']) < 2 || in_array('f36', $_SERVER['argv'])) {
-	$dest = 'fedora/36/modular/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f36'];
-	$mod .= genModule('fedora/36/php74/x86_64',  $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/36/php80/x86_64',  $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/36/php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/36/php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2']);
-	$mod .= genModule('fedora/36/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/36/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/36/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/36/redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis);
-	$mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']);
-	$mod .= genModule('fedora/36/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
-	$mod .= genDefaults('memcached', false, ['remi']);
-	createRepo($dest, $mod);
-
-	$dest = 'fedora/36/debug-modular/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f36'];
-	$mod .= genModule('fedora/36/debug-php74/x86_64',  $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/36/debug-php80/x86_64',  $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/36/debug-php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/36/debug-php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/36/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/36/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/36/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/36/debug-redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/36/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
-	createRepo($dest, $mod);
-}
-if (in_array('f36', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
-	$dest = 'fedora/36/modular-test/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f36'];
-	$mod .= genModule('fedora/36/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/36/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/36/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/36/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
-	createRepo($dest, $mod);
-
-	$dest = 'fedora/36/debug-modular-test/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f36'];
-	$mod .= genModule('fedora/36/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/36/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/36/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/36/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
-	createRepo($dest, $mod);
-}
-
-if (count($_SERVER['argv']) < 2 || in_array('f37', $_SERVER['argv'])) {
-	$dest = 'fedora/37/modular/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f37'];
-	$mod .= genModule('fedora/37/php74/x86_64',  $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/php80/x86_64',  $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/php83/x86_64',  $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
-	$mod .= genModule('fedora/37/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/37/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/37/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/37/redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis);
-	$mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']);
-	$mod .= genModule('fedora/37/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
-	$mod .= genDefaults('memcached', false, ['remi']);
-	createRepo($dest, $mod);
-
-	$dest = 'fedora/37/debug-modular/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f37'];
-	$mod .= genModule('fedora/37/debug-php74/x86_64',  $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/debug-php80/x86_64',  $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/debug-php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/debug-php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/debug-php83/x86_64',  $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/37/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/37/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/37/debug-redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('fedora/37/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
-	createRepo($dest, $mod);
-}
-if (in_array('f37', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
-	$dest = 'fedora/37/modular-test/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f37'];
-	$mod .= genModule('fedora/37/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
-	createRepo($dest, $mod);
-
-	$dest = 'fedora/37/debug-modular-test/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'f37'];
-	$mod .= genModule('fedora/37/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/37/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
-	createRepo($dest, $mod);
-}
-*/
 
 if (count($_SERVER['argv']) < 2 || in_array('f38', $_SERVER['argv'])) {
 	$dest = 'fedora/38/modular/x86_64';
@@ -1350,46 +1091,4 @@ if (count($_SERVER['argv']) > 1 && in_array('epel', $_SERVER['argv'])) {
 	createRepo($dest, $mod);
 }
 
-if (in_array('el7', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
-	$dest = 'enterprise/7/modular-test/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'el7'];
-	$mod .= genModule('enterprise/7/test71/x86_64',  $dest, '*.rpm',         '7.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/test72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/test73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/test74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/test80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/test81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/test82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/test83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
-	createRepo($dest, $mod);
-}
-if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])
-	|| in_array('7.3', $_SERVER['argv']) || in_array('7.2', $_SERVER['argv']) || in_array('7.1', $_SERVER['argv'])) {
-	$dest = 'enterprise/7/modular/x86_64';
-	echo "Populate $dest\n";
-	cleanup($dest);
-	$mod  = '';
-
-	$deps = ['platform' => 'el7'];
-	$mod .= genModule('enterprise/7/php71/x86_64',  $dest, '*.rpm',         '7.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/php72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/php73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/php74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/php82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
-	$mod .= genModule('enterprise/7/php83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', '7.2', ['remi-7.1', 'remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
-
-	$mod .= genModule('enterprise/7/remi/x86_64',  $dest, 'redis*5.0*.rpm', '5.0', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('enterprise/7/remi/x86_64',  $dest, 'redis*6.0*.rpm', '6.0', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('enterprise/7/remi/x86_64',  $dest, 'redis*6.2*.rpm', '6.2', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('enterprise/7/remi/x86_64',  $dest, 'redis*7.0*.rpm', '7.0', 'x86_64', $deps, $template_redis);
-	$mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']);
-	createRepo($dest, $mod);
-}
 echo "Done\n";
diff --git a/mockit b/mockit
index ade3b54..a5f6cbf 100755
--- a/mockit
+++ b/mockit
@@ -143,19 +143,15 @@ case $DIST in
 		LST="72 73 74 80 81 82 83"
 		SCL="56 70 71 72 73 74 80 81 82 83"
 		;;
-	el7x)
-		LST="54 55 56 70 71 72 73 74 80 81 82 83"
-		SCL="54 55 56 70 71 72 73 74 80 81 82 83"
-		;;
 	allx)
 		if [ $REDIS -ge 1 ]; then
-			for i in fc38x fc39x fc40x el7x el8x el9x fc39a fc40a el8a el9a
+			for i in fc38x fc39x fc40x el8x el9x fc39a fc40a el8a el9a
 			do
 				[ $BUILD_BASE -ge 1 ] && $0 --redis --base $SRPM $i $MIN $MAX $@
 				[ $BUILD_SCLS -ge 1 ] && $0 --redis --scl  $SRPM $i $MIN $MAX $@
 			done
 		else
-			echo Not support for direct build
+			echo Not supported for direct build
 		fi
 		;;
 	*)
-- 
cgit