diff options
| -rwxr-xr-x | getmock | 4 | ||||
| -rwxr-xr-x | mkmodular | 83 |
2 files changed, 22 insertions, 65 deletions
@@ -291,6 +291,10 @@ if [[ $1 == redis* ]]; then opt=$1 shift fi +if [[ $1 == memcached ]]; then + opt=$1 + shift +fi if [[ $1 == composer* ]]; then opt=$1 shift @@ -157,39 +157,42 @@ data: EOT; -$template_glpi = <<< EOT +$template_memcached = <<< EOT --- document: modulemd version: 2 data: - name: glpi - stream: @VERSION@ + name: memcached + stream: remi version: @DATE@ context: 00000000 arch: @ARCH@ - summary: Free IT asset management software + summary: High Performance, Distributed Memory Object Cache description: >- - glpi @VERSION@ module + Alternative memcached module. + The remi stream provides more recent versions + and than default repository. license: module: - GPLv2+ content: - - GPLv2+ and GPLv3+ and MIT + - BSD dependencies: - buildrequires: platform: [@DIST@] requires: @DEPS@ references: - documentation: https://glpi-project.org/ - tracker: https://github.com/glpi-project/glpi/issues + documentation: https://memcached.org/ + tracker: https://github.com/memcached/memcached/issues profiles: common: rpms: - - glpi + - memcached + - memcached-selinux api: rpms: - - glpi + - memcached artifacts: rpms: @RPMS@ @@ -366,51 +369,6 @@ rename($data, "$data.$arch"); exec("gpg --armor --detach-sign --default-key \"$GPG_NAME\" --homedir \"$GPG_PATH\" repodata/repomd.xml"); chdir($old); } -/* -if (count($_SERVER['argv']) < 2 || in_array('f31', $_SERVER['argv'])) { - $dest = 'fedora/31/modular/x86_64'; - echo "Populate $dest\n"; - cleanup($dest); - $deps = ['platform' => 'f31']; - $mod = genModule('fedora/31/remi/x86_64', $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/31/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/31/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $mod .= genDefaults('php', 'remi-7.3', ['remi-7.3', 'remi-7.4', 'remi-8.0']); - $mod .= genModule('fedora/31/glpi93/x86_64', $dest, '*.rpm', '9.3', 'x86_64', $deps, $template_glpi); - $mod .= genModule('fedora/31/glpi94/x86_64', $dest, '*.rpm', '9.4', 'x86_64', $deps, $template_glpi); - $mod .= genDefaults('glpi', '9.4', ['9.3', '9.4']); - createRepo($dest, $mod); -} -if (in_array('f31', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { - $dest = 'fedora/31/modular-test/x86_64'; - echo "Populate $dest\n"; - cleanup($dest); - $deps = ['platform' => 'f31']; - $mod = genModule('fedora/31/test/x86_64', $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/31/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/31/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - 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 .= genModule('fedora/32/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0']); - createRepo($dest, $mod); -} -if (in_array('f32', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { - $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); - $mod .= genModule('fedora/32/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - createRepo($dest, $mod); -} -*/ if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) { $dest = 'fedora/33/modular/x86_64'; @@ -505,10 +463,6 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) { $mod .= genModule('enterprise/8/redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2']); $deps = ['platform' => 'el8', 'php' => '']; - $mod .= genModule('enterprise/8/glpi93/x86_64', $dest, '*.rpm', '9.3', 'x86_64', $deps, $template_glpi); - $mod .= genModule('enterprise/8/glpi94/x86_64', $dest, '*.rpm', '9.4', 'x86_64', $deps, $template_glpi); - $mod .= genDefaults('glpi', '9.4', ['9.3', '9.4']); - $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/composer1/x86_64', $dest, '*.rpm', '1', 'x86_64', $deps, $template_comp); $mod .= genModule('enterprise/8/composer2/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); $mod .= genDefaults('composer', '2', ['1', '2']); @@ -533,8 +487,12 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $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/redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/9/redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-6.2']); + $mod .= genDefaults('redis', false, ['remi-5.0', 'remi-6.0', 'remi-6.2']); + $mod .= genModule('enterprise/9/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached); + $mod .= genDefaults('memcached', false, ['remi']); $deps = ['platform' => 'el9', 'php' => '']; $mod .= genModule('enterprise/9/composer2/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); $mod .= genDefaults('composer', '2', ['2']); @@ -585,11 +543,6 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) { $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.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); - $mod .= genModule('enterprise/7/glpi93/x86_64', $dest, '*.rpm', '9.3', 'x86_64', $deps, $template_glpi); - $mod .= genModule('enterprise/7/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); } echo "Done\n"; |