F34 helpers

1 files changed, 24 insertions, 3 deletions

diff --git a/mkmodular b/mkmodular
index 94835ff..730638a 100755
--- a/mkmodular
+++ b/mkmodular
@@ -240,7 +240,7 @@ EOT;
 
 function findPackages($from, $dest, $pat) {
 	global $oldrpms;
-	$excl = ['php-amqplib', 'php-jsonlint', 'php-laminas-mime', 'php-cs-fixer'];
+	$excl = ['php-amqplib', 'php-jsonlint', 'php-laminas-mime', 'php-cs-fixer', 'php-tecnickcom-tc-lib-unicode-data', 'php-doctrine-orm'];
 	$rpms = [];
 	foreach (glob("$from/$pat") as $file) {
 		$info = rpminfo($file);
@@ -334,7 +334,7 @@ rename($data, "$data.$arch");
 
 chdir($old);
 }
-
+/*
 if (count($_SERVER['argv']) < 2 || in_array('f31', $_SERVER['argv'])) {
 	$dest = 'fedora/31/modular/x86_64';
 	echo "Populate $dest\n";
@@ -359,7 +359,7 @@ 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";
@@ -400,6 +400,26 @@ if (in_array('f33', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	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);
+	$deps = ['platform' => 'f34'];
+	$mod  = genModule('fedora/34/remi/x86_64',   $dest, ['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 .= genDefaults('php', 'remi-7.4', ['remi-7.4', 'remi-8.0']);
+	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);
+	$deps = ['platform' => 'f34'];
+	$mod  = genModule('fedora/34/test/x86_64',   $dest, ['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);
+	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";
@@ -476,6 +496,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) {
 	$mod .= genDefaults('php', '7.2', ['remi-7.1', 'remi-7.2', 'remi-7.3', 'remi-7.4']);
 	$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.0', 'x86_64', $deps, $template_redis);
 	$mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0']);
 	$deps = ['platform' => 'el7', 'php' => ''];
 	$mod .= genModule('enterprise/7/glpi92/x86_64', $dest, '*.rpm',         '9.2', 'x86_64', $deps, $template_glpi);