diff options
| -rwxr-xr-x | mkmodular | 59 | ||||
| -rw-r--r-- | wizard/index.php | 2 |
2 files changed, 7 insertions, 54 deletions
@@ -256,6 +256,9 @@ function genModule($srce, $dest, $pats, $ver, $arch, $deps, $template) { foreach($deps as $n => $v) { $deptxt .= ($deptxt ? "\n" : '') . " $n: [$v]"; } + if (empty($rpms)) { + return ''; + } $rpmstxt = ''; foreach($rpms as $rpm) { $rpmstxt .= ($rpmstxt ? "\n" : '') . " - $rpm"; @@ -292,55 +295,6 @@ rename($data, "$data.$arch"); chdir(__DIR__); } -/* -if (count($_SERVER['argv']) < 2 || in_array('f29', $_SERVER['argv'])) { - $dest = 'fedora/29/modular/x86_64'; - echo "Populate $dest\n"; - cleanup($dest); - $deps = ['platform' => 'f29']; - $mod = genModule('fedora/29/remi/x86_64', $dest, ['unit-php*rpm', 'php-*7.2*.rpm'], '7.2', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/29/php73/x86_64', $dest, '*.rpm', '7.3', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/29/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genDefaults('php', 'remi-7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4']); - $mod .= genModule('fedora/29/glpi92/x86_64', $dest, '*.rpm', '9.2', 'x86_64', $deps, $template_glpi); - $mod .= genModule('fedora/29/glpi93/x86_64', $dest, '*.rpm', '9.3', 'x86_64', $deps, $template_glpi); - $mod .= genModule('fedora/29/glpi94/x86_64', $dest, '*.rpm', '9.4', 'x86_64', $deps, $template_glpi); - $mod .= genDefaults('glpi', '9.4', ['9.2', '9.3', '9.4']); - createRepo($dest, $mod); - - $dest = 'fedora/29/modular-test/x86_64'; - echo "Populate $dest\n"; - cleanup($dest); - $deps = ['platform' => 'f29']; - $mod = genModule('fedora/29/test/x86_64', $dest, ['unit-php*rpm', 'php-*7.2*.rpm'], '7.2', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/29/test73/x86_64', $dest, '*.rpm', '7.3', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/29/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - createRepo($dest, $mod); - - $dest = 'fedora/29/modular/i386'; - echo "Populate $dest\n"; - cleanup($dest); - $deps = ['platform' => 'f29']; - $mod = genModule('fedora/29/remi/i386', $dest, ['unit-php*rpm', 'php-*7.2*.rpm'], '7.2', 'i386', $deps, $template_php); - $mod .= genModule('fedora/29/php73/i386', $dest, '*.rpm', '7.3', 'i386', $deps, $template_php); - $mod .= genModule('fedora/29/php74/i386', $dest, '*.rpm', '7.4', 'i386', $deps, $template_php); - $mod .= genDefaults('php', 'remi-7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4']); - $mod .= genModule('fedora/29/glpi92/i386', $dest, '*.rpm', '9.2', 'i386', $deps, $template_glpi); - $mod .= genModule('fedora/29/glpi93/i386', $dest, '*.rpm', '9.3', 'i386', $deps, $template_glpi); - $mod .= genModule('fedora/29/glpi94/i386', $dest, '*.rpm', '9.4', 'i386', $deps, $template_glpi); - $mod .= genDefaults('glpi', '9.4', ['9.2', '9.3', '9.4']); - createRepo($dest, $mod); - - $dest = 'fedora/29/modular-test/i386'; - echo "Populate $dest\n"; - cleanup($dest); - $deps = ['platform' => 'f29']; - $mod = genModule('fedora/29/test/i386', $dest, ['unit-php*rpm', 'php-*7.2*.rpm'], '7.2', 'i386', $deps, $template_php); - $mod .= genModule('fedora/29/test73/i386', $dest, '*.rpm', '7.3', 'i386', $deps, $template_php); - $mod .= genModule('fedora/29/test74/i386', $dest, '*.rpm', '7.4', 'i386', $deps, $template_php); - createRepo($dest, $mod); -} -*/ if (count($_SERVER['argv']) < 2 || in_array('f30', $_SERVER['argv'])) { $dest = 'fedora/30/modular/x86_64'; echo "Populate $dest\n"; @@ -430,7 +384,6 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) { $mod = genModule('enterprise/8/test72/x86_64', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_php); $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/test/x86_64', $dest, 'redis*6.0*.rpm', '6.0', 'x86_64', $deps, $template_redis); createRepo($dest, $mod); $dest = 'enterprise/8/modular/x86_64'; @@ -442,8 +395,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) { $mod .= genModule('enterprise/8/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4']); $deps = ['platform' => 'el8']; - $mod .= genModule('enterprise/8/remi/x86_64', $dest, 'redis*5.0*.rpm', '5.0', 'x86_64', $deps, $template_redis); - $mod .= genModule('enterprise/8/remi/x86_64', $dest, 'redis*6.0*.rpm', '6.0', 'x86_64', $deps, $template_redis); + $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); $mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0']); $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/glpi93/x86_64', $dest, '*.rpm', '9.3', 'x86_64', $deps, $template_glpi); @@ -473,7 +426,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) { $mod = genModule('enterprise/7/test72/x86_64', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_php); $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/test/x86_64', $dest, 'redis*6.0*.rpm', '6.0', 'x86_64', $deps, $template_redis); +// $mod .= genModule('enterprise/7/test/x86_64', $dest, 'redis*6.0*.rpm', '6.0', 'x86_64', $deps, $template_redis); createRepo($dest, $mod); $dest = 'enterprise/7/modular/x86_64'; diff --git a/wizard/index.php b/wizard/index.php index 5d4fb476..5bbdfde7 100644 --- a/wizard/index.php +++ b/wizard/index.php @@ -82,7 +82,7 @@ $phpvers = [ ]; $phpname = [ ':devel' => 'Development version, not ready for production', - '8.0' => '8.0.0-dev (2020-05-13 snapshot)', + '8.0' => '8.0.0-dev (2020-05-19 snapshot)', ':stable' => 'Stable versions - usage recommended', '7.4' => '7.4.6 (active support until November 2021)', '7.3' => '7.3.18 (active support until December 2020)', |