8.1 helpers

1 files changed, 13 insertions, 5 deletions

diff --git a/mkmodular b/mkmodular
index 51fd59a..3cf25cc 100755
--- a/mkmodular
+++ b/mkmodular
@@ -417,7 +417,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) {
 	$deps = ['platform' => 'f33'];
 	$mod  = genModule('fedora/33/remi/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/33/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0']);
+	$mod .= genModule('fedora/33/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']);
 	createRepo($dest, $mod);
 }
 if (in_array('f33', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -427,6 +428,7 @@ if (in_array('f33', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$deps = ['platform' => 'f33'];
 	$mod  = genModule('fedora/33/test/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/33/test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/33/test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -437,7 +439,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f34', $_SERVER['argv'])) {
 	$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', false, ['remi-7.4', 'remi-8.0']);
+	$mod .= genModule('fedora/34/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']);
 	createRepo($dest, $mod);
 }
 if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -447,6 +450,7 @@ if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$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);
+	$mod .= genModule('fedora/34/test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -459,6 +463,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/8/test73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/test74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/test80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/8/test81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
@@ -470,7 +475,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/8/php73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/php74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0']);
+	$mod .= genModule('enterprise/8/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1']);
 	$deps = ['platform' => 'el8'];
 	$mod .= genModule('enterprise/8/redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/8/redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
@@ -511,6 +517,7 @@ if (in_array('el7', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/7/test73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/test74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/test80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/7/test81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) {
@@ -523,11 +530,12 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/7/php73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/php74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', '7.2', ['remi-7.1', 'remi-7.2', 'remi-7.3', 'remi-7.4']);
+	$mod .= genModule('enterprise/7/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', '7.2', ['remi-7.1', 'remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1']);
 	$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']);
+	$mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2']);
 	$deps = ['platform' => 'el7', 'php' => ''];
 	$mod .= genModule('enterprise/7/glpi92/x86_64', $dest, '*.rpm',         '9.2', 'x86_64', $deps, $template_glpi);
 	$mod .= genModule('enterprise/7/glpi93/x86_64', $dest, '*.rpm',         '9.3', 'x86_64', $deps, $template_glpi);