F41 helpers

5 files changed, 174 insertions, 195 deletions

diff --git a/buildfct b/buildfct
index 4c6eb91..f71e669 100644
--- a/buildfct
+++ b/buildfct
@@ -41,58 +41,18 @@ alias mockfc40xr70="             mock --configdir=$mocketc -r fc40xr70
 alias mockfc40xr72="             mock --configdir=$mocketc -r fc40xr72            rebuild "
 alias mockfc40xm="               mock --configdir=$mocketc -r fc40xm              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 "
-alias mockel6i56="setarch i686 mock --configdir=$mocketc -r el6i56 --arch i686 rebuild "
-alias mockel6i70="setarch i686 mock --configdir=$mocketc -r el6i70 --arch i686 rebuild "
-alias mockel6i71="setarch i686 mock --configdir=$mocketc -r el6i71 --arch i686 rebuild "
-alias mockel6i72="setarch i686 mock --configdir=$mocketc -r el6i72 --arch i686 rebuild "
-alias mockel6i73="setarch i686 mock --configdir=$mocketc -r el6i73 --arch i686 rebuild "
-alias mockel6x="               mock --configdir=$mocketc -r el6x               rebuild "
-alias mockel6xt="              mock --configdir=$mocketc -r el6xt              rebuild "
-alias mockel6x55="             mock --configdir=$mocketc -r el6x55             rebuild "
-alias mockel6t56="             mock --configdir=$mocketc -r el6t56             rebuild "
-alias mockel6x56="             mock --configdir=$mocketc -r el6x56             rebuild "
-alias mockel6x70="             mock --configdir=$mocketc -r el6x70             rebuild "
-alias mockel6x71="             mock --configdir=$mocketc -r el6x71             rebuild "
-alias mockel6x72="             mock --configdir=$mocketc -r el6x72             rebuild "
-alias mockel6x73="             mock --configdir=$mocketc -r el6x73             rebuild "
-alias mockel6xscl54="          mock --configdir=$mocketc -r el6xscl54          rebuild "
-alias mockel6xscl55="          mock --configdir=$mocketc -r el6xscl55          rebuild "
-alias mockel6xscl56="          mock --configdir=$mocketc -r el6xscl56          rebuild "
-alias mockel6xscl70="          mock --configdir=$mocketc -r el6xscl70          rebuild "
-alias mockel6xscl71="          mock --configdir=$mocketc -r el6xscl71          rebuild "
-alias mockel6xscl72="          mock --configdir=$mocketc -r el6xscl72          rebuild "
-alias mockel6xscl73="          mock --configdir=$mocketc -r el6xscl73          rebuild "
-
-alias mockel7x="               mock --configdir=$mocketc -r el7x               rebuild "
-alias mockel7xr="              mock --configdir=$mocketc -r el7xr              rebuild "
-alias mockel7xt="              mock --configdir=$mocketc -r el7xt              rebuild "
-alias mockel7x55="             mock --configdir=$mocketc -r el7x55             rebuild "
-alias mockel7t56="             mock --configdir=$mocketc -r el7t56             rebuild "
-alias mockel7x56="             mock --configdir=$mocketc -r el7x56             rebuild "
-alias mockel7x70="             mock --configdir=$mocketc -r el7x70             rebuild "
-alias mockel7x71="             mock --configdir=$mocketc -r el7x71             rebuild "
-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 mockel7x81="             mock --configdir=$mocketc -r el7x81             rebuild "
-alias mockel7x82="             mock --configdir=$mocketc -r el7x82             rebuild "
-alias mockel7x83="             mock --configdir=$mocketc -r el7x83             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 "
-alias mockel7xscl70="          mock --configdir=$mocketc -r el7xscl70          rebuild "
-alias mockel7xscl71="          mock --configdir=$mocketc -r el7xscl71          rebuild "
-alias mockel7xscl72="          mock --configdir=$mocketc -r el7xscl72          rebuild "
-alias mockel7xscl73="          mock --configdir=$mocketc -r el7xscl73          rebuild "
-alias mockel7xscl74="          mock --configdir=$mocketc -r el7xscl74          rebuild "
-alias mockel7xscl80="          mock --configdir=$mocketc -r el7xscl80          rebuild "
-alias mockel7xscl81="          mock --configdir=$mocketc -r el7xscl81          rebuild "
-alias mockel7xscl82="          mock --configdir=$mocketc -r el7xscl82          rebuild "
-alias mockel7xscl83="          mock --configdir=$mocketc -r el7xscl83          rebuild "
+alias mockfc41x="                mock --configdir=$mocketc -r fc41x               rebuild "
+alias mockfc41x74="              mock --configdir=$mocketc -r fc41x74             rebuild "
+alias mockfc41x80="              mock --configdir=$mocketc -r fc41x80             rebuild "
+alias mockfc41x81="              mock --configdir=$mocketc -r fc41x81             rebuild "
+alias mockfc41x82="              mock --configdir=$mocketc -r fc41x82             rebuild "
+alias mockfc41x83="              mock --configdir=$mocketc -r fc41x83             rebuild "
+alias mockfc41xscl74="           mock --configdir=$mocketc -r fc41xscl74          rebuild "
+alias mockfc41xscl80="           mock --configdir=$mocketc -r fc41xscl80          rebuild "
+alias mockfc41xscl81="           mock --configdir=$mocketc -r fc41xscl81          rebuild "
+alias mockfc41xscl82="           mock --configdir=$mocketc -r fc41xscl82          rebuild "
+alias mockfc41xscl83="           mock --configdir=$mocketc -r fc41xscl83          rebuild "
+alias mockfc41xscl84="           mock --configdir=$mocketc -r fc41xscl84          rebuild "
 
 alias mockel8x="               mock --configdir=$mocketc -r el8x               rebuild "
 alias mockel8xr="              mock --configdir=$mocketc -r el8xr              rebuild "
@@ -185,7 +145,10 @@ if [ -f "$1" ]; then
   date +%X
   pids=""
     echo -n ""
-    (mock $quiet --configdir=$mocketc -r fc40x     rebuild "$@" && echo "$(date +%X) (82) fc40  Ok." || echo "fc40 Error !")&
+    (mock $quiet --configdir=$mocketc -r fc41x     rebuild "$@" && echo "$(date +%X) (83) fc41  Ok." || echo "fc40 Error !")&
+    pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r fc40x     rebuild "$@" && echo "$(date +%X) (83) fc40  Ok." || echo "fc40 Error !")&
     pids="$pids $!"
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc39x     rebuild "$@" && echo "$(date +%X) (82) fc39  Ok." || echo "fc39 Error !")&
@@ -215,7 +178,10 @@ if [ -f "$1" ]; then
   date +%X
   pids=""
     echo -n ""
-    (mock $quiet --configdir=$mocketc -r fc40x     rebuild "$@" && echo "$(date +%X) (82) fc40  Ok." || echo "fc40 Error !")&
+    (mock $quiet --configdir=$mocketc -r fc41x     rebuild "$@" && echo "$(date +%X) (83) fc41  Ok." || echo "fc40 Error !")&
+    pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r fc40x     rebuild "$@" && echo "$(date +%X) (83) fc40  Ok." || echo "fc40 Error !")&
     pids="$pids $!"
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc39x     rebuild "$@" && echo "$(date +%X) (82) fc39  Ok." || echo "fc39 Error !")&
@@ -306,7 +272,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 39 40
+  for i in 41 39 40
   do
     echo -n "$(date +%X) 74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -332,7 +298,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 39 40
+  for i in 39 40 41
   do
     echo -n "$(date +%X) scl84 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl84 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -358,7 +324,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 39 40
+  for i in 39 41 40
   do
     echo -n "$(date +%X) scl83 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -384,7 +350,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 39 40
+  for i in 39 40 41
   do
     echo -n "$(date +%X) scl82 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -410,7 +376,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 39 40
+  for i in 39 41 40
   do
     echo -n "$(date +%X) scl81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -524,7 +490,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 40 39
+  for i in 41 40 39
   do
     echo -n "$(date +%X) 83 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -592,7 +558,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 40 39
+  for i in 40 41 39
   do
     echo -n "$(date +%X) 82 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -618,7 +584,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 40 39
+  for i in 40 39 41
   do
     echo -n "$(date +%X) 81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -644,7 +610,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 39 40
+  for i in 39 41 40
   do
     echo -n "$(date +%X) 80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -670,7 +636,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 39 40
+  for i in 39 40 41
   do
     echo -n "$(date +%X) scl80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -696,7 +662,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 40 39
+  for i in 40 41 39
   do
     echo -n "$(date +%X) scl74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index eb5ed10..9d60cd1 100755
--- a/getmock
+++ b/getmock
@@ -50,52 +50,6 @@ scl70el*)	dep=${dep#scl70el}
 scl56el*)	dep=${dep#scl56el}
 	type=enterprise
 	;;
-scl55el*)	dep=${dep#scl55el}
-	type=enterprise
-	;;
-scl54el*)	dep=${dep#scl54el}
-	type=enterprise
-	;;
-el?x55)
-	dep=${1:2:1}
-    if [ "$2" == "php55" -o "$2" == "test55" ]
-    then	rep=$rep
-	elif [ "$2" == "remi" ]
-	then	rep=php55
-	else	rep=${2}55
-	fi
-	type=enterprise
-	;;
-el?x56)
-	dep=${1:2:1}
-    if [ "$2" == "php56" -o "$2" == "test56" ]
-    then	rep=$rep
-	elif [ "$2" == "remi" ]
-	then	rep=php56
-	else	rep=${2}56
-	fi
-	type=enterprise
-	;;
-el?x70)
-	dep=${1:2:1}
-    if [ "$2" == "php70" -o "$2" == "test70" ]
-    then	rep=$rep
-	elif [ "$2" == "remi" ]
-	then	rep=php70
-	else	rep=${2}70
-	fi
-	type=enterprise
-	;;
-el?x71)
-	dep=${1:2:1}
-    if [ "$2" == "php71" -o "$2" == "test71" ]
-    then	rep=$rep
-	elif [ "$2" == "remi" ]
-	then	rep=php71
-	else	rep=${2}71
-	fi
-	type=enterprise
-	;;
 el??72)
 	dep=${1:2:1}
     if [ "$2" == "php72" -o "$2" == "test72" ]
@@ -240,27 +194,6 @@ scl80fc*)	dep=${dep#scl80fc}
 scl74fc*)	dep=${dep#scl74fc}
 	type=fedora
 	;;
-scl73fc*)	dep=${dep#scl73fc}
-	type=fedora
-	;;
-scl72fc*)	dep=${dep#scl72fc}
-	type=fedora
-	;;
-scl71fc*)	dep=${dep#scl71fc}
-	type=fedora
-	;;
-scl70fc*)	dep=${dep#scl70fc}
-	type=fedora
-	;;
-scl56fc*)	dep=${dep#scl56fc}
-	type=fedora
-	;;
-scl55fc*)	dep=${dep#scl55fc}
-	type=fedora
-	;;
-scl54fc*)	dep=${dep#scl54fc}
-	type=fedora
-	;;
 *)	echo Connais pas $dep
 	;;
 esac
@@ -312,6 +245,13 @@ do
 				cp $i priv/el9.x86_64 && echo + $i copied priv EL9
 			fi
 			;;
+		remi-crypto*fc41*)
+			if [ -f priv/fc41.x86_64/$j ]; then
+				echo " " $i already there
+			else
+				cp $i priv/fc41.x86_64 && echo + $i copied priv FC41
+			fi
+			;;
 		remi-crypto*fc40*)
 			if [ -f priv/fc40.x86_64/$j ]; then
 				echo " " $i already there
@@ -448,11 +388,7 @@ if [ $1 = devs -o $1 = dev ]; then
 	shift
 fi
 
-if [ $1 = all55 ]; then
-	n=7
-		getOneMock el${n}x55 php55 '*5.5*'
-
-elif [ $1 = all56 ]; then
+if [ $1 = all56 ]; then
 	n=7
 		getOneMock el${n}x56 php56 '*5.6*'
 
@@ -635,80 +571,46 @@ elif [ $1 = scl71 ]; then
 	done
 
 elif [ $1 = scl84 ]; then
-	for i in fc39 fc40 el8 el9
+	for dis in fc39 fc40 fc41 el8 el9
 	do
-		getOneMock scl84${i}x $opt
+		getOneMock scl84${dis}a $opt
+		getOneMock scl84${dis}x $opt
 	done
-		getOneMock scl84fc39a   $opt
-		getOneMock scl84fc40a   $opt
-		getOneMock scl84el8a    $opt
-		getOneMock scl84el9a    $opt
 
 elif [ $1 = scl83 ]; then
-	for i in fc39 fc40 el8 el9
+	for dis in fc39 fc40 fc41 el8 el9
 	do
-		getOneMock scl83${i}x $opt
+		getOneMock scl83${dis}x $opt
+		getOneMock scl83${dis}a $opt
 	done
-		getOneMock scl83fc39a   $opt
-		getOneMock scl83fc40a   $opt
-		getOneMock scl83el8a    $opt
-		getOneMock scl83el9a    $opt
 
 elif [ $1 = scl82 ]; then
-	for i in 39 40
-	do
-		getOneMock scl82fc${i}x $opt
-	done
-		getOneMock scl82fc39a   $opt
-		getOneMock scl82fc40a   $opt
-	for i in 8 9
+	for dis in fc39 fc40 fc41 el8 el9
 	do
-		getOneMock scl82el${i}x $opt
+		getOneMock scl82${dis}x $opt
+		getOneMock scl82${dis}a $opt
 	done
-		getOneMock scl82el8a    $opt
-		getOneMock scl82el9a    $opt
 
 elif [ $1 = scl81 ]; then
-	for i in 39 40
-	do
-		getOneMock scl81fc${i}x $opt
-	done
-		getOneMock scl81fc39a   $opt
-		getOneMock scl81fc40a   $opt
-	for i in 8 9
+	for dis in fc39 fc40 fc41 el8 el9
 	do
-		getOneMock scl81el${i}x $opt
+		getOneMock scl81${dis}x $opt
+		getOneMock scl81${dis}a $opt
 	done
-		getOneMock scl81el8a    $opt
-		getOneMock scl81el9a    $opt
 
 elif [ $1 = scl80 ]; then
-	for i in 39 40
-	do
-		getOneMock scl80fc${i}x $opt
-	done
-		getOneMock scl80fc39a   $opt
-		getOneMock scl80fc40a   $opt
-	for i in 8 9
+	for dis in fc39 fc40 fc41 el8 el9
 	do
-		getOneMock scl80el${i}x $opt
+		getOneMock scl80${dis}x $opt
+		getOneMock scl80${dis}a $opt
 	done
-		getOneMock scl80el8a    $opt
-		getOneMock scl80el9a    $opt
 
 elif [ $1 = scl74 ]; then
-	for i in 39 40
-	do
-		getOneMock scl74fc${i}x $opt
-	done
-		getOneMock scl74fc39a   $opt
-		getOneMock scl74fc40a   $opt
-	for i in 8 9
+	for dis in fc39 fc40 fc41 el8 el9
 	do
-		getOneMock scl74el${i}x $opt
+		getOneMock scl74${dis}x $opt
+		getOneMock scl74${dis}a $opt
 	done
-		getOneMock scl74el8a    $opt
-		getOneMock scl74el9a    $opt
 
 elif [ $1 = scl73 ]; then
 	for i in 8
diff --git a/mkallrepo b/mkallrepo
index 434ab0a..fd8d76d 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}/*/{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/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
@@ -50,6 +50,7 @@ if [ -s $TMPSIG ]; then
 	# 2024
     grep src.rpm $TMPSIG  > $TMPSIG2024
     grep fc40    $TMPSIG >> $TMPSIG2024
+    grep fc41    $TMPSIG >> $TMPSIG2024
 
     if [ -s $TMPSIG2024 ]; then
 		echo "== Signature des $(cat $TMPSIG2024 | wc -l) nouveaux RPM (2024) =="
@@ -104,7 +105,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{39,40}/*/{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/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
diff --git a/mkmodular b/mkmodular
index 1eb655f..981ca5d 100755
--- a/mkmodular
+++ b/mkmodular
@@ -47,14 +47,12 @@ data:
       - php-xml
     devel:
       rpms:
-      - libzip
       - php-cli
       - php-common
       - php-devel
       - php-fpm
       - php-mbstring
       - php-pear
-      - php-pecl-zip
       - php-process
       - php-xml
     minimal:
@@ -661,6 +659,118 @@ if (in_array('f40', $_SERVER['argv']) || in_array('f40a', $_SERVER['argv']) || i
 	createRepo($dest, $mod);
 }
 
+if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv'])) {
+	$dest = 'fedora/41/modular/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f41'];
+	$mod .= genModule('fedora/41/php74/x86_64',  $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/php80/x86_64',  $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/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']);
+	createRepo($dest, $mod);
+
+	$dest = 'fedora/41/debug-modular/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f41'];
+	$mod .= genModule('fedora/41/debug-php74/x86_64',  $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-php80/x86_64',  $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-php83/x86_64',  $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+	createRepo($dest, $mod);
+}
+if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+	$dest = 'fedora/41/modular-test/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f41'];
+	$mod .= genModule('fedora/41/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+	createRepo($dest, $mod);
+
+	$dest = 'fedora/41/debug-modular-test/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f41'];
+	$mod .= genModule('fedora/41/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+	createRepo($dest, $mod);
+}
+
+if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv'])) {
+	$dest = 'fedora/41/modular/aarch64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f41'];
+	$mod .= genModule('fedora/41/php74/aarch64',  $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/php80/aarch64',  $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/php81/aarch64',  $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/php82/aarch64',  $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/php83/aarch64',  $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
+	createRepo($dest, $mod);
+
+	$dest = 'fedora/41/debug-modular/aarch64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f41'];
+	$mod .= genModule('fedora/41/debug-php74/aarch64',  $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-php80/aarch64',  $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-php81/aarch64',  $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-php82/aarch64',  $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-php83/aarch64',  $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+	createRepo($dest, $mod);
+}
+if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+	$dest = 'fedora/41/modular-test/aarch64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f41'];
+	$mod .= genModule('fedora/41/test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+	createRepo($dest, $mod);
+
+	$dest = 'fedora/41/debug-modular-test/aarch64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f41'];
+	$mod .= genModule('fedora/41/debug-test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+	createRepo($dest, $mod);
+}
+
 if (in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$dest = 'enterprise/8/modular-test/x86_64';
 	echo "Populate $dest\n";
diff --git a/mockit b/mockit
index 829717f..9366631 100755
--- a/mockit
+++ b/mockit
@@ -131,7 +131,7 @@ fi
 # PHP version matrix
 echo mockit $SRPM $DIST $MIN $MAX $@
 case $DIST in
-	fc39x|fc39a|fc40x|fc40a|el9x|el9a)
+	fc39x|fc39a|fc40x|fc40a|fc41x|fc41a|el9x|el9a)
 		LST="82 81 74 80 83"
 		SCL="74 80 81 82 83 84"
 		;;
@@ -145,7 +145,7 @@ case $DIST in
 		;;
 	allx)
 		if [ $REDIS -ge 1 ]; then
-			for i in fc39x fc40x el8x el9x fc39a fc40a el8a el9a
+			for i in fc39x fc40x fc41x el8x el9x fc39a fc40a fc41a 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 $@