From 81d5c5834c1da04cf1323b732550204eda477312 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 17 Jan 2023 16:16:44 +0100 Subject: minor fix for fedora stream --- mkmodular | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mkmodular b/mkmodular index 55625f4..839466c 100755 --- a/mkmodular +++ b/mkmodular @@ -521,7 +521,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f36', $_SERVER['argv'])) { $mod .= genModule('fedora/36/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/36/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0']); - $mod .= genModule('fedora/36/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/36/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); createRepo($dest, $mod); @@ -538,7 +538,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f36', $_SERVER['argv'])) { $mod .= genModule('fedora/36/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/36/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/36/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/36/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/36/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); createRepo($dest, $mod); } if (in_array('f36', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -583,7 +583,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f37', $_SERVER['argv'])) { $mod .= genModule('fedora/37/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/37/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0']); - $mod .= genModule('fedora/37/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/37/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); createRepo($dest, $mod); @@ -600,7 +600,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f37', $_SERVER['argv'])) { $mod .= genModule('fedora/37/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/37/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/37/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/37/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/37/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); createRepo($dest, $mod); } if (in_array('f37', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -799,7 +799,7 @@ if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv'])) { $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2']); // $mod .= genModule('enterprise/9/redis50/aarch64', $dest, 'redis*.rpm', '5.0', 'aarch64', $deps, $template_redis); -// $mod .= genModule('enterprise/9/redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/9/redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis62/aarch64', $dest, 'redis*.rpm', '6.2', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis70/aarch64', $dest, 'redis*.rpm', '7.0', 'aarch64', $deps, $template_redis); $mod .= genDefaults('redis', false, ['remi-6.2', 'remi-7.0']); @@ -823,7 +823,7 @@ if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); // $mod .= genModule('enterprise/9/debug-redis50/aarch64', $dest, 'redis*.rpm', '5.0', 'aarch64', $deps, $template_redis); -// $mod .= genModule('enterprise/9/debug-redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/9/debug-redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis62/aarch64', $dest, 'redis*.rpm', '6.2', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis70/aarch64', $dest, 'redis*.rpm', '7.0', 'aarch64', $deps, $template_redis); @@ -882,7 +882,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) { $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.2', 'x86_64', $deps, $template_redis); - $mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2']); + $mod .= genModule('enterprise/7/remi/x86_64', $dest, 'redis*7.0*.rpm', '7.0', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0']); createRepo($dest, $mod); } echo "Done\n"; -- cgit