add F35 helpers, remove F32

1 files changed, 21 insertions, 1 deletions

diff --git a/mkmodular b/mkmodular
index 3cf25cc..495cfea 100755
--- a/mkmodular
+++ b/mkmodular
@@ -389,7 +389,6 @@ if (in_array('f31', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('fedora/31/test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
-*/
 if (count($_SERVER['argv']) < 2 || in_array('f32', $_SERVER['argv'])) {
 	$dest = 'fedora/32/modular/x86_64';
 	echo "Populate $dest\n";
@@ -409,6 +408,7 @@ if (in_array('f32', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('fedora/32/test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
+*/
 
 if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) {
 	$dest = 'fedora/33/modular/x86_64';
@@ -454,6 +454,26 @@ if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	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);
+	$deps = ['platform' => 'f35'];
+	$mod  = genModule('fedora/35/remi/x86_64',   $dest, ['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 .= genDefaults('php', false, ['remi-8.0', 'remi-8.1']);
+	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);
+	$deps = ['platform' => 'f35'];
+	$mod  = genModule('fedora/35/test/x86_64',   $dest, ['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);
+	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";