EL-10 helpers

6 files changed, 294 insertions, 29 deletions

diff --git a/buildfct b/buildfct
index 44366e4..2c405f6 100644
--- a/buildfct
+++ b/buildfct
@@ -110,6 +110,24 @@ alias mockel9xr70="            mock --configdir=$mocketc -r el9xr70            r
 alias mockel9xr72="            mock --configdir=$mocketc -r el9xr72            rebuild "
 alias mockel9xm="              mock --configdir=$mocketc -r el9xm              rebuild "
 
+alias mockel10x="               mock --configdir=$mocketc -r el10x               rebuild "
+alias mockel10n="               mock --configdir=$mocketc -r el10n               rebuild "
+alias mockel10x74="             mock --configdir=$mocketc -r el10x74             rebuild "
+alias mockel10x80="             mock --configdir=$mocketc -r el10x80             rebuild "
+alias mockel10x81="             mock --configdir=$mocketc -r el10x81             rebuild "
+alias mockel10n81="             mock --configdir=$mocketc -r el10n81             rebuild "
+alias mockel10x82="             mock --configdir=$mocketc -r el10x82             rebuild "
+alias mockel10n82="             mock --configdir=$mocketc -r el10n82             rebuild "
+alias mockel10x83="             mock --configdir=$mocketc -r el10x83             rebuild "
+alias mockel10x84="             mock --configdir=$mocketc -r el10x84             rebuild "
+alias mockel10xscl74="          mock --configdir=$mocketc -r el10xscl74          rebuild "
+alias mockel10xscl80="          mock --configdir=$mocketc -r el10xscl80          rebuild "
+alias mockel10xscl81="          mock --configdir=$mocketc -r el10xscl81          rebuild "
+alias mockel10xscl82="          mock --configdir=$mocketc -r el10xscl82          rebuild "
+alias mockel10xscl83="          mock --configdir=$mocketc -r el10xscl83          rebuild "
+alias mockel10xscl84="          mock --configdir=$mocketc -r el10xscl84          rebuild "
+alias mockel10xm="              mock --configdir=$mocketc -r el10xm              rebuild "
+
 alias mockepel872="            mock --configdir=$mocketc -r epel872            rebuild "
 alias mockepel873="            mock --configdir=$mocketc -r epel873            rebuild "
 alias mockepel874="            mock --configdir=$mocketc -r epel874            rebuild "
@@ -164,6 +182,9 @@ if [ -f "$1" ]; then
     echo -n ""
     (mock $quiet --configdir=$mocketc -r el9n81    rebuild "$@" && echo "$(date +%X) (81) el9   Ok." || echo "el9  Error !")&
     pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el10x     rebuild "$@" && echo "$(date +%X) (83) el10  Ok." || echo "el10 Error !")&
+    pids="$pids $!"
   wait $pids
   date +%X
 else
@@ -197,6 +218,9 @@ if [ -f "$1" ]; then
     echo -n ""
     (mock $quiet --configdir=$mocketc -r el9n82    rebuild "$@" && echo "$(date +%X) (81) el9   Ok." || echo "el9  Error !")&
     pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el10x     rebuild "$@" && echo "$(date +%X) (83) el10  Ok." || echo "el10 Error !")&
+    pids="$pids $!"
   wait $pids
   date +%X
 else
@@ -282,7 +306,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
+  for i in 10 9 8
   do
     echo -n "$(date +%X) 74 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -308,7 +332,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) scl84 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl84 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 8 9
+  for i in 8 9 10
   do
     echo -n "$(date +%X) scl84 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl84 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -334,7 +358,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 8 9
+  for i in 10 8 9
   do
     echo -n "$(date +%X) scl83 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -360,7 +384,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 8 9
+  for i in 8 10 9
   do
     echo -n "$(date +%X) scl82 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -386,7 +410,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 8 9
+  for i in 8 9 10
   do
     echo -n "$(date +%X) scl81 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -500,7 +524,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) 84 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x84 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 8 9
+  for i in 8 9 10
   do
     echo -n "$(date +%X) 84 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x84 rebuild "$@"&& echo " Ok." || echo " Error !"
@@ -526,7 +550,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
+  for i in 8 9 10
   do
     echo -n "$(date +%X) 83 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x83 rebuild "$@"&& echo " Ok." || echo " Error !"
@@ -594,7 +618,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
+  for i in 8 10 9
   do
     echo -n "$(date +%X) 82 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x82 rebuild "$@"&& echo " Ok." || echo " Error !"
@@ -620,7 +644,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
+  for i in 8 9 10
   do
     echo -n "$(date +%X) 81 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x81 rebuild "$@"&& echo " Ok." || echo " Error !"
@@ -646,7 +670,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
+  for i in 10 9 8
   do
     echo -n "$(date +%X) 80 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x80 rebuild "$@"&& echo " Ok." || echo " Error !"
@@ -672,7 +696,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 8
+  for i in 9 8 10
   do
     echo -n "$(date +%X) scl80 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -698,7 +722,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 9 8
+  for i in 9 8 10
   do
     echo -n "$(date +%X) scl74 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index d5df66b..fe067ba 100755
--- a/getmock
+++ b/getmock
@@ -80,6 +80,16 @@ el??74)
 	fi
 	type=enterprise
 	;;
+el???74)
+	dep=${1:2:2}
+    if [ "$2" == "php74" -o "$2" == "test74" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php74
+	else	rep=${2}74
+	fi
+	type=enterprise
+	;;
 el??80)
 	dep=${1:2:1}
     if [ "$2" == "php80" -o "$2" == "test80" ]
@@ -90,6 +100,16 @@ el??80)
 	fi
 	type=enterprise
 	;;
+el???80)
+	dep=${1:2:2}
+    if [ "$2" == "php80" -o "$2" == "test80" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php80
+	else	rep=${2}80
+	fi
+	type=enterprise
+	;;
 el??81)
 	dep=${1:2:1}
     if [ "$2" == "php81" -o "$2" == "test81" ]
@@ -100,6 +120,16 @@ el??81)
 	fi
 	type=enterprise
 	;;
+el???81)
+	dep=${1:2:2}
+    if [ "$2" == "php81" -o "$2" == "test81" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php81
+	else	rep=${2}81
+	fi
+	type=enterprise
+	;;
 el??82)
 	dep=${1:2:1}
     if [ "$2" == "php82" -o "$2" == "test82" ]
@@ -110,6 +140,16 @@ el??82)
 	fi
 	type=enterprise
 	;;
+el???82)
+	dep=${1:2:2}
+    if [ "$2" == "php82" -o "$2" == "test82" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php82
+	else	rep=${2}82
+	fi
+	type=enterprise
+	;;
 el??83)
 	dep=${1:2:1}
     if [ "$2" == "php83" -o "$2" == "test83" ]
@@ -120,6 +160,16 @@ el??83)
 	fi
 	type=enterprise
 	;;
+el???83)
+	dep=${1:2:2}
+    if [ "$2" == "php83" -o "$2" == "test83" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php83
+	else	rep=${2}83
+	fi
+	type=enterprise
+	;;
 el??84)
 	dep=${1:2:1}
     if [ "$2" == "php84" -o "$2" == "test84" ]
@@ -130,6 +180,16 @@ el??84)
 	fi
 	type=enterprise
 	;;
+el???84)
+	dep=${1:2:2}
+    if [ "$2" == "php84" -o "$2" == "test84" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php84
+	else	rep=${2}84
+	fi
+	type=enterprise
+	;;
 fc???74)
 	dep=${1:2:2}
     if [ "$2" == "php74" -o "$2" == "test74" ]
@@ -265,6 +325,13 @@ do
 				cp $i priv/el9.x86_64 && echo + $i copied priv EL9
 			fi
 			;;
+		remi-crypto*el10*)
+			if [ -f priv/el10.x86_64/$j ]; then
+				echo " " $i already there
+			else
+				cp $i priv/el10.x86_64 && echo + $i copied priv EL10
+			fi
+			;;
 		remi-crypto*fc41*)
 			if [ -f priv/fc41.x86_64/$j ]; then
 				echo " " $i already there
@@ -449,6 +516,8 @@ elif [ $1 = all74 ]; then
 		getOneMock el8a74  $opt '*7.4*'
 		getOneMock el9x74  $opt '*7.4*'
 		getOneMock el9a74  $opt '*7.4*'
+		getOneMock el10x74 $opt '*7.4*'
+		getOneMock el10a74 $opt '*7.4*'
 
 elif [ $1 = all80 ]; then
 	[ $opt = remi ] && opt=php80
@@ -463,6 +532,8 @@ elif [ $1 = all80 ]; then
 		getOneMock el8a80  $opt '*8.0*'
 		getOneMock el9x80  $opt '*8.0*'
 		getOneMock el9a80  $opt '*8.0*'
+		getOneMock el10x80 $opt '*8.0*'
+		getOneMock el10a80 $opt '*8.0*'
 
 elif [ $1 = all81 ]; then
 	[ $opt = remi ] && opt=php81
@@ -477,6 +548,8 @@ elif [ $1 = all81 ]; then
 		getOneMock el8a81  $opt '*8.1*'
 		getOneMock el9x81  $opt '*8.1*'
 		getOneMock el9a81  $opt '*8.1*'
+		getOneMock el10x81 $opt '*8.1*'
+		getOneMock el10a81 $opt '*8.1*'
 
 elif [ $1 = all82 ]; then
 	[ $opt = remi ] && opt=php82
@@ -491,6 +564,8 @@ elif [ $1 = all82 ]; then
 		getOneMock el8a82  $opt '*8.2*'
 		getOneMock el9x82  $opt '*8.2*'
 		getOneMock el9a82  $opt '*8.2*'
+		getOneMock el10x82 $opt '*8.2*'
+		getOneMock el10a82 $opt '*8.2*'
 
 elif [ $1 = all83 ]; then
 	[ $opt = remi ] && opt=php83
@@ -505,6 +580,8 @@ elif [ $1 = all83 ]; then
 		getOneMock el8a83  $opt '*8.3*'
 		getOneMock el9x83  $opt '*8.3*'
 		getOneMock el9a83  $opt '*8.3*'
+		getOneMock el10x83 $opt '*8.3*'
+		getOneMock el10a83 $opt '*8.3*'
 
 elif [ $1 = all84 ]; then
 	[ $opt = remi ] && opt=php84
@@ -519,6 +596,8 @@ elif [ $1 = all84 ]; then
 		getOneMock el8a84  $opt '*8.4*'
 		getOneMock el9x84  $opt '*8.4*'
 		getOneMock el9a84  $opt '*8.4*'
+		getOneMock el10x84 $opt '*8.4*'
+		getOneMock el10a84 $opt '*8.4*'
 
 elif [ $1 = allr60 ]; then
 	opt=redis60
@@ -583,7 +662,7 @@ elif [ $1 = allx ]; then
 	do
 		getOneMock fc${i}x $opt
 	done
-	for i in 8 9
+	for i in 8 9 10
 	do
 		getOneMock el${i}x $opt
 	done
@@ -593,7 +672,7 @@ elif [ $1 = alla ]; then
 	do
 		getOneMock fc${i}a $opt
 	done
-	for i in 8 9
+	for i in 8 9 10
 	do
 		getOneMock el${i}a $opt
 	done
@@ -617,42 +696,42 @@ elif [ $1 = scl71 ]; then
 	done
 
 elif [ $1 = scl84 ]; then
-	for dis in fc39 fc40 fc41 el8 el9
+	for dis in fc39 fc40 fc41 el8 el9 el10
 	do
 		getOneMock scl84${dis}a $opt
 		getOneMock scl84${dis}x $opt
 	done
 
 elif [ $1 = scl83 ]; then
-	for dis in fc39 fc40 fc41 el8 el9
+	for dis in fc39 fc40 fc41 el8 el9 el10
 	do
 		getOneMock scl83${dis}x $opt
 		getOneMock scl83${dis}a $opt
 	done
 
 elif [ $1 = scl82 ]; then
-	for dis in fc39 fc40 fc41 el8 el9
+	for dis in fc39 fc40 fc41 el8 el9 el10
 	do
 		getOneMock scl82${dis}x $opt
 		getOneMock scl82${dis}a $opt
 	done
 
 elif [ $1 = scl81 ]; then
-	for dis in fc39 fc40 fc41 el8 el9
+	for dis in fc39 fc40 fc41 el8 el9 el10
 	do
 		getOneMock scl81${dis}x $opt
 		getOneMock scl81${dis}a $opt
 	done
 
 elif [ $1 = scl80 ]; then
-	for dis in fc39 fc40 fc41 el8 el9
+	for dis in fc39 fc40 fc41 el8 el9 el10
 	do
 		getOneMock scl80${dis}x $opt
 		getOneMock scl80${dis}a $opt
 	done
 
 elif [ $1 = scl74 ]; then
-	for dis in fc39 fc40 fc41 el8 el9
+	for dis in fc39 fc40 fc41 el8 el9 el10
 	do
 		getOneMock scl74${dis}x $opt
 		getOneMock scl74${dis}a $opt
diff --git a/mkallrepo b/mkallrepo
index fd8d76d..cd23483 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -10,7 +10,7 @@ TMPSIG2024=$(mktemp -t XXXXXXXX.2024)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{39,40,41}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{39,40,41}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
@@ -51,6 +51,7 @@ if [ -s $TMPSIG ]; then
     grep src.rpm $TMPSIG  > $TMPSIG2024
     grep fc40    $TMPSIG >> $TMPSIG2024
     grep fc41    $TMPSIG >> $TMPSIG2024
+    grep el10    $TMPSIG >> $TMPSIG2024
 
     if [ -s $TMPSIG2024 ]; then
 		echo "== Signature des $(cat $TMPSIG2024 | wc -l) nouveaux RPM (2024) =="
@@ -105,7 +106,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{39,40,41}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{39,40,41}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
diff --git a/mkmodular b/mkmodular
index 6a4005a..ee088c6 100755
--- a/mkmodular
+++ b/mkmodular
@@ -360,7 +360,9 @@ if ($dis == "fedora") {
 		$GPG_NAME="5F136145BF10369B7685D8DE503666CCBBAE6F1B";
 	}
 } else {
-	if ($ver >= 9) {
+	if ($ver >= 10) {
+		$GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4";
+	} else if ($ver >= 9) {
 		$GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947";
 	} else if ($ver == 8) {
 		$GPG_NAME="6B38FEA7231F87F52B9CA9D8555097595F11735A";
@@ -1157,6 +1159,160 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	createRepo($dest, $mod);
 }
 
+if (in_array('el10', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+	$dest = 'enterprise/10/modular-test/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'el10'];
+	$mod .= genModule('enterprise/10/test74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/test80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/test81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/100/test82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/test83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/test84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
+
+	$deps = ['platform' => 'el10', 'php' => ''];
+	$mod .= genModule('enterprise/10/composer2-test/x86_64', $dest, '*.rpm',   '2', 'x86_64', $deps, $template_comp);
+	createRepo($dest, $mod);
+
+	$dest = 'enterprise/10/debug-modular-test/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'el10'];
+	$mod .= genModule('enterprise/10/debug-test74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-test80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-test81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-test82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-test83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-test84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
+	createRepo($dest, $mod);
+}
+
+if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])
+	|| in_array('noarch', $_SERVER['argv'])) {
+	$dest = 'enterprise/10/modular/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'el10'];
+	$mod .= genModule('enterprise/10/php74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/php82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/php83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/php84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
+
+	$mod .= genModule('enterprise/10/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
+	$mod .= genDefaults('memcached', false, ['remi']);
+
+	$mod .= genModule('enterprise/10/composer2/x86_64', $dest, '*.rpm',         '2', 'x86_64', $deps, $template_comp);
+	$mod .= genDefaults('composer', false, ['2']);
+	createRepo($dest, $mod);
+}
+if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) {
+	$dest = 'enterprise/10/debug-modular/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'el10'];
+	$mod .= genModule('enterprise/10/debug-php74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-php82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-php83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-php84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
+
+	$mod .= genModule('enterprise/10/debug-redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis);
+	$mod .= genModule('enterprise/10/debug-redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
+	$mod .= genModule('enterprise/10/debug-redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis);
+	$mod .= genModule('enterprise/10/debug-redis70/x86_64', $dest, 'redis*.rpm', '7.0', 'x86_64', $deps, $template_redis);
+	$mod .= genModule('enterprise/10/debug-redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis);
+
+	$mod .= genModule('enterprise/10/debug-memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
+	createRepo($dest, $mod);
+}
+
+if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])
+	|| in_array('noarch', $_SERVER['argv'])) {
+	$dest = 'enterprise/10/modular/aarch64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'el10'];
+	$mod .= genModule('enterprise/10/php74/aarch64',  $dest, '*.rpm',         '7.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/php80/aarch64',  $dest, '*.rpm',         '8.0', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/php81/aarch64',  $dest, '*.rpm',         '8.1', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/php82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/php83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/php84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
+
+	$mod .= genModule('enterprise/10/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
+	$mod .= genDefaults('memcached', false, ['remi']);
+
+	$mod .= genModule('enterprise/10/composer2/x86_64', $dest, '*noarch.rpm', '2', 'aarch64', $deps, $template_comp);
+	$mod .= genDefaults('composer', false, ['2']);
+	createRepo($dest, $mod);
+}
+if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) {
+	$dest = 'enterprise/10/debug-modular/aarch64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'el10'];
+	$mod .= genModule('enterprise/10/debug-php74/aarch64',  $dest, '*.rpm',         '7.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-php80/aarch64',  $dest, '*.rpm',         '8.0', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-php81/aarch64',  $dest, '*.rpm',         '8.1', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-php82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-php83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-php84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
+
+	$mod .= genModule('enterprise/10/debug-memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
+	createRepo($dest, $mod);
+}
+
+if (in_array('el10', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+	$dest = 'enterprise/10/modular-test/aarch64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'el10'];
+	$mod .= genModule('enterprise/10/test74/aarch64',  $dest, '*.rpm',         '7.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/test80/aarch64',  $dest, '*.rpm',         '8.0', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/test81/aarch64',  $dest, '*.rpm',         '8.1', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/test82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/test83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/test84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
+
+	$deps = ['platform' => 'el10', 'php' => ''];
+	$mod .= genModule('enterprise/10/composer2-test/x86_64', $dest, '*.rpm',   '2', 'x86_64', $deps, $template_comp);
+	createRepo($dest, $mod);
+
+	$dest = 'enterprise/10/debug-modular-test/aarch64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'el10'];
+	$mod .= genModule('enterprise/10/debug-test74/aarch64',  $dest, '*.rpm',         '7.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-test80/aarch64',  $dest, '*.rpm',         '8.0', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-test81/aarch64',  $dest, '*.rpm',         '8.1', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-test82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-test83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-test84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
+	createRepo($dest, $mod);
+}
+
 if (count($_SERVER['argv']) > 1 && in_array('epel', $_SERVER['argv'])) {
 	$dest = 'temp/epel-8-modular';
 	echo "Populate $dest\n";
diff --git a/mkrepo b/mkrepo
index 429811d..0dfecfa 100755
--- a/mkrepo
+++ b/mkrepo
@@ -49,7 +49,10 @@ if [ "$dis" == "fedora" ]; then
 	fi
 else
 	# Enterprise
-	if [ "$ver" -ge 9 ]
+	if [ "$ver" -ge 10 ]
+	then echo "key 2021"
+		GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4"
+	elif [ "$ver" -ge 9 ]
 	then echo "key 2021"
 		GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947"
 	elif [ "$ver" -ge 8 ]
diff --git a/mockit b/mockit
index c3a3c1d..1dcd8f5 100755
--- a/mockit
+++ b/mockit
@@ -37,9 +37,11 @@ fi
 # Queue commands
 if [ "$1" == "--list" ]; then
 	echo "-- x86_64 queue: $($REDISCLI scard mockx) tasks --"
-	$REDISCLI smembers mockx
-	echo "-- aarch64 queue: $($REDISCLI scard mocka) tasks --"
-	$REDISCLI smembers mocka
+	a=$($REDISCLI smembers mockx)
+	[ -n "$a" ] && $REDISCLI smembers mockx || ps -ef | grep mock/mock | grep -v grep
+	echo -e "\n-- aarch64 queue: $($REDISCLI scard mocka) tasks --"
+	a=$($REDISCLI smembers mocka)
+	[ -n "$a" ] && $REDISCLI smembers mocka || ps -ef | ssh remi@ampere 'ps -ef | grep mock/mock'
 	exit 0
 elif [ "$1" == "--clean" ]; then
 	$REDISCLI del mockx
@@ -132,7 +134,7 @@ fi
 # PHP version matrix
 echo mockit $SRPM $DIST $MIN $MAX $@
 case $DIST in
-	fc39x|fc39a|fc40x|fc40a|fc41x|fc41a|el9x|el9a)
+	fc39x|fc39a|fc40x|fc40a|fc41x|fc41a|el9x|el9a|el10x|el10a)
 		LST="82 81 74 80 83 84"
 		SCL="74 80 81 82 83 84"
 		;;
@@ -146,7 +148,7 @@ case $DIST in
 		;;
 	allx)
 		if [ $REDIS -ge 1 ]; then
-			for i in fc39x fc40x fc41x el8x el9x fc39a fc40a fc41a el8a el9a
+			for i in fc39x fc40x fc41x el8x el9x el10x fc39a fc40a fc41a el8a el9a el10a
 			do
 				[ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@
 				[ $BUILD_SCLS -ge 1 ] && $0 --valkey --scl  $SRPM $i $MIN $MAX $@