summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-02-19 08:34:57 +0100
committerRemi Collet <remi@remirepo.net>2020-02-19 08:34:57 +0100
commitbf10893a929a5d2cc83fb6cd605df37eaa5d0895 (patch)
tree20162f247c44f572b766617161045c95e8433dcd
parentaa6388a40c9fad68b2259cbe2dcd3a86fe284e03 (diff)
modular: drop F29, add F32
-rwxr-xr-xmkmodular23
1 files 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";