From 3ebec349b0100333c93fda9cbb6afe04e1b006a8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Nov 2021 16:59:24 +0100 Subject: EL-9 helpers --- mkmodular | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'mkmodular') diff --git a/mkmodular b/mkmodular index 495cfea..c12347e 100755 --- a/mkmodular +++ b/mkmodular @@ -339,7 +339,9 @@ if ($dis == "fedora") { $GPG_PATH="/home/remi/.gnupg2019"; } } else { - if ($ver >= 8) { + if ($ver >= 9) { + $GPG_PATH="/home/remi/.gnupg2021"; + } else if ($ver == 8) { $GPG_PATH="/home/remi/.gnupg2018"; } else { $GPG_PATH="/home/remi/.gnupgrpm"; @@ -513,6 +515,33 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) { createRepo($dest, $mod); } +if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { + $dest = 'enterprise/9/modular-test/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $deps = ['platform' => 'el9']; + $mod .= genModule('enterprise/9/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/9/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + createRepo($dest, $mod); +} +if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { + $dest = 'enterprise/9/modular/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $deps = ['platform' => 'el9']; + $mod .= genModule('enterprise/9/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/9/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genDefaults('php', false, ['remi-8.0', 'remi-8.1']); + $deps = ['platform' => 'el9']; + $mod .= genModule('enterprise/9/redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-6.2']); + $deps = ['platform' => 'el9', 'php' => '']; + $mod .= genModule('enterprise/9/composer2/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); + $mod .= genDefaults('composer', '2', ['2']); + createRepo($dest, $mod); +} + + if (count($_SERVER['argv']) > 1 && in_array('epel', $_SERVER['argv'])) { $dest = 'temp/epel-8-modular'; echo "Populate $dest\n"; @@ -554,7 +583,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', '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 .= genModule('enterprise/7/remi/x86_64', $dest, 'redis*6.2*.rpm', '6.2', 'x86_64', $deps, $template_redis); $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); -- cgit