-f34, +f37

4 files changed, 106 insertions, 41 deletions

diff --git a/buildfct b/buildfct
index df96109..629f2ec 100644
--- a/buildfct
+++ b/buildfct
@@ -51,6 +51,21 @@ alias mockfc36xr62="             mock --configdir=$mocketc -r fc36xr62
 alias mockfc36xr70="             mock --configdir=$mocketc -r fc36xr70            rebuild "
 alias mockfc36xm="               mock --configdir=$mocketc -r fc36xm              rebuild "
 
+alias mockfc37i="  setarch i686  mock --configdir=$mocketc -r fc37i   --arch i686 rebuild "
+alias mockfc37x="                mock --configdir=$mocketc -r fc37x               rebuild "
+alias mockfc37xd="               mock --configdir=$mocketc -r fc37xd              rebuild "
+alias mockfc37xr="               mock --configdir=$mocketc -r fc37xr              rebuild "
+alias mockfc37x74="              mock --configdir=$mocketc -r fc37x74             rebuild "
+alias mockfc37x80="              mock --configdir=$mocketc -r fc37x80             rebuild "
+alias mockfc37x81="              mock --configdir=$mocketc -r fc37x81             rebuild "
+alias mockfc37xscl74="           mock --configdir=$mocketc -r fc37xscl74          rebuild "
+alias mockfc37xscl80="           mock --configdir=$mocketc -r fc37xscl80          rebuild "
+alias mockfc37xscl81="           mock --configdir=$mocketc -r fc37xscl81          rebuild "
+alias mockfc37xscl82="           mock --configdir=$mocketc -r fc37xscl82          rebuild "
+alias mockfc37xr62="             mock --configdir=$mocketc -r fc37xr62            rebuild "
+alias mockfc37xr70="             mock --configdir=$mocketc -r fc37xr70            rebuild "
+alias mockfc37xm="               mock --configdir=$mocketc -r fc37xm              rebuild "
+
 alias mockel6i="  setarch i686 mock --configdir=$mocketc -r el6i   --arch i686 rebuild "
 alias mockel6it=" setarch i686 mock --configdir=$mocketc -r el6it  --arch i686 rebuild "
 alias mockel6i55="setarch i686 mock --configdir=$mocketc -r el6i55 --arch i686 rebuild "
@@ -153,7 +168,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35 34
+  for i in 35
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo " Ok." || echo " Error !"
@@ -179,7 +194,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35 34
+  for i in 35
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xr rebuild "$@" && echo " Ok." || echo " Error !"
@@ -205,7 +220,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35 34
+  for i in 35
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo " Ok." || echo " Error !"
@@ -269,7 +284,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 34 35 36
+  for i in 35 36 37
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x   rebuild "$@" && echo "$(date +%X) (7x) fc$i  Ok." || echo "fc$1 Error !")&
@@ -448,12 +463,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 34
-  do
-    echo -n "$(date +%X) 74 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}x   rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  for i in 35 36
+  for i in 35 36 37
   do
     echo -n "$(date +%X) 74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -505,7 +515,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35 34 36
+  for i in 35 36
   do
     echo -n "$(date +%X) scl81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -535,8 +545,6 @@ if [ -f "$1" ]; then
   mock $quiet --configdir=$mocketc -r fc36xr70 rebuild "$@" && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) r70 f35 "
   mock $quiet --configdir=$mocketc -r fc35x    rebuild "$@" && echo " Ok." || echo " Error !"
-  echo -n "$(date +%X) r70 f34 "
-  mock $quiet --configdir=$mocketc -r fc34x    rebuild "$@" && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) r70 el9  "
   mock $quiet --configdir=$mocketc -r el9xr70  rebuild "$@" && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) r70 el8  "
@@ -559,7 +567,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35 34 36
+  for i in 35 36 37
   do
     echo -n "$(date +%X) 81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -590,7 +598,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) 80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x   rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 34 36
+  for i in 36 37
   do
     echo -n "$(date +%X) 80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -616,7 +624,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 34 35 36
+  for i in 35 36
   do
     echo -n "$(date +%X) scl80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -642,7 +650,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35 34 36
+  for i in 35 36
   do
     echo -n "$(date +%X) scl74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -668,7 +676,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35 34
+  for i in 35
   do
     echo -n "$(date +%X) scl73 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl73 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -694,7 +702,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 34 35
+  for i in 35
   do
     echo -n "$(date +%X) scl72 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl72 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -720,7 +728,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35 34
+  for i in 35
   do
     echo -n "$(date +%X) scl71 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -746,7 +754,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 34 35
+  for i in 35
   do
     echo -n "$(date +%X) scl70 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -772,7 +780,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35 34
+  for i in 35
   do
     echo -n "$(date +%X) scl56 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index 4e08420..80806c9 100755
--- a/getmock
+++ b/getmock
@@ -419,38 +419,40 @@ elif [ $1 = all73 ]; then
 		getOneMock el8x73  $opt '*7.3*'
 
 elif [ $1 = all74 ]; then
-		getOneMock fc34x   $opt '*7.4*'
 	[ $opt = remi ] && opt=php74
 	[ $opt = test ] && opt=test74
 		getOneMock fc35x74 $opt '*7.4*'
 		getOneMock fc36x74 $opt '*7.4*'
+		getOneMock fc37x74 $opt '*7.4*'
 		getOneMock el7x74  $opt '*7.4*'
 		getOneMock el8x74  $opt '*7.4*'
 		getOneMock el9x74  $opt '*7.4*'
+		getOneMock el9a74  $opt '*7.4*'
 
 elif [ $1 = all80 ]; then
 		getOneMock fc35x   $opt '*8.0*'
 	[ $opt = remi ] && opt=php80
 	[ $opt = test ] && opt=test80
-		getOneMock fc34x80 $opt '*8.0*'
 		getOneMock fc36x80 $opt '*8.0*'
+		getOneMock fc37x80 $opt '*8.0*'
 		getOneMock el7x80  $opt '*8.0*'
 		getOneMock el8x80  $opt '*8.0*'
 		getOneMock el9x80  $opt '*8.0*'
+		getOneMock el9a80  $opt '*8.0*'
 
 elif [ $1 = all81 ]; then
 	[ $opt = remi ] && opt=php81
 	[ $opt = test ] && opt=test81
-		getOneMock fc34x81 $opt '*8.1*'
 		getOneMock fc35x81 $opt '*8.1*'
 		getOneMock fc36x81 $opt '*8.1*'
+		getOneMock fc37x81 $opt '*8.1*'
 		getOneMock el7x81  $opt '*8.1*'
 		getOneMock el8x81  $opt '*8.1*'
 		getOneMock el9x81  $opt '*8.1*'
+		getOneMock el9a81  $opt '*8.1*'
 
 elif [ $1 = allr62 ]; then
 	opt=remi
-	getOneMock fc34x $opt '*6.2*'
 	getOneMock fc35x $opt '*6.2*'
 	getOneMock el7x  $opt '*6.2*'
 	opt=redis62
@@ -461,7 +463,6 @@ elif [ $1 = allr62 ]; then
 
 elif [ $1 = allr70 ]; then
 	opt=remi
-	getOneMock fc34x $opt '*7.0*'
 	getOneMock fc35x $opt '*7.0*'
 	getOneMock el7x  $opt '*7.0*'
 	opt=redis70
@@ -487,7 +488,7 @@ elif [ $1 = for55 ]; then
 	done
 
 elif [ $1 = allx ]; then
-	for i in 34 35 36
+	for i in 35 36 37
 	do
 		getOneMock fc${i}x $opt
 	done
@@ -509,7 +510,7 @@ elif [ $1 = scl55 ]; then
 	done
 
 elif [ $1 = scl56 ]; then
-	for i in 34 35
+	for i in 35
 	do
 		getOneMock scl56fc${i}x $opt
 	done
@@ -519,7 +520,7 @@ elif [ $1 = scl56 ]; then
 	done
 
 elif [ $1 = scl70 ]; then
-	for i in 34 35
+	for i in 35
 	do
 		getOneMock scl70fc${i}x $opt
 	done
@@ -529,7 +530,7 @@ elif [ $1 = scl70 ]; then
 	done
 
 elif [ $1 = scl71 ]; then
-	for i in 34 35
+	for i in 35
 	do
 		getOneMock scl71fc${i}x $opt
 	done
@@ -539,7 +540,7 @@ elif [ $1 = scl71 ]; then
 	done
 
 elif [ $1 = scl82 ]; then
-	for i in 35 36
+	for i in 35 36 37
 	do
 		getOneMock scl82fc${i}x $opt
 	done
@@ -549,7 +550,7 @@ elif [ $1 = scl82 ]; then
 	done
 
 elif [ $1 = scl81 ]; then
-	for i in 34 35 36
+	for i in 35 36 37
 	do
 		getOneMock scl81fc${i}x $opt
 	done
@@ -559,7 +560,7 @@ elif [ $1 = scl81 ]; then
 	done
 
 elif [ $1 = scl80 ]; then
-	for i in 34 35 36
+	for i in 35 36 37
 	do
 		getOneMock scl80fc${i}x $opt
 	done
@@ -569,7 +570,7 @@ elif [ $1 = scl80 ]; then
 	done
 
 elif [ $1 = scl74 ]; then
-	for i in 34 35 36
+	for i in 35 36 37
 	do
 		getOneMock scl74fc${i}x $opt
 	done
@@ -579,7 +580,7 @@ elif [ $1 = scl74 ]; then
 	done
 
 elif [ $1 = scl73 ]; then
-	for i in 34 35
+	for i in 35
 	do
 		getOneMock scl73fc${i}x $opt
 	done
@@ -589,7 +590,7 @@ elif [ $1 = scl73 ]; then
 	done
 
 elif [ $1 = scl72 ]; then
-	for i in 34 35
+	for i in 35
 	do
 		getOneMock scl72fc${i}x $opt
 	done
diff --git a/mkallrepo b/mkallrepo
index 79abb6d..9ba5151 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -9,7 +9,7 @@ TMPSIG2022=$(mktemp -t XXXXXXXX.2022)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{34,35,36}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{34,35,36,37}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
@@ -48,6 +48,7 @@ if [ -s $TMPSIG ]; then
     grep el9     $TMPSIG >> $TMPSIG2021
 	# 2022
     grep fc36    $TMPSIG  > $TMPSIG2022
+    grep fc37    $TMPSIG >> $TMPSIG2022
     grep src.rpm $TMPSIG >> $TMPSIG2022
 
     if [ -s $TMPSIG2022 ]; then
@@ -96,7 +97,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{34,35,36}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{34,35,36,37}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
diff --git a/mkmodular b/mkmodular
index a641643..ed026ab 100755
--- a/mkmodular
+++ b/mkmodular
@@ -401,7 +401,7 @@ if (in_array('f33', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$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";
@@ -449,7 +449,7 @@ if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$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";
@@ -552,6 +552,61 @@ if (in_array('f36', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	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 .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']);
+//	$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 .= genDefaults('redis', false, ['remi-6.2', 'remi-7.0']);
+//	$mod .= genModule('fedora/37/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_redis);
+//	$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-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);
+	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);
+	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);
+	createRepo($dest, $mod);
+}
+
 if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$dest = 'enterprise/8/modular-test/x86_64';
 	echo "Populate $dest\n";