From bf10893a929a5d2cc83fb6cd605df37eaa5d0895 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Feb 2020 08:34:57 +0100 Subject: modular: drop F29, add F32 --- mkmodular | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/mkmodular b/mkmodular index 84017b2f..cab184a4 100755 --- a/mkmodular +++ b/mkmodular @@ -243,7 +243,7 @@ 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"; @@ -291,7 +291,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f29', $_SERVER['argv'])) { $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"; @@ -356,6 +356,25 @@ if (count($_SERVER['argv']) < 2 || in_array('f31', $_SERVER['argv'])) { createRepo($dest, $mod); } +if (count($_SERVER['argv']) < 2 || in_array('f32', $_SERVER['argv'])) { + $dest = 'fedora/32/modular/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $deps = ['platform' => 'f32']; + $mod = genModule('fedora/32/remi/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); + $mod .= genDefaults('php', 'remi-7.4', ['remi-7.4']); + $mod .= genModule('fedora/32/glpi94/x86_64', $dest, '*.rpm', '9.4', 'x86_64', $deps, $template_glpi); + $mod .= genDefaults('glpi', '9.4', ['9.4']); + createRepo($dest, $mod); + + $dest = 'fedora/32/modular-test/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $deps = ['platform' => 'f32']; + $mod = genModule('fedora/32/test/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); + createRepo($dest, $mod); +} + if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) { $dest = 'enterprise/8/modular-test/x86_64'; echo "Populate $dest\n"; -- cgit