From 695d187bbab4b8f26127d178fd417879c547cb4b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Dec 2021 11:21:37 +0100 Subject: F35 now have 7.4 as module --- mkmodular | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mkmodular') diff --git a/mkmodular b/mkmodular index 512a28c..b2563c5 100755 --- a/mkmodular +++ b/mkmodular @@ -453,9 +453,10 @@ if (count($_SERVER['argv']) < 2 || in_array('f35', $_SERVER['argv'])) { $mod = ''; $deps = ['platform' => 'f35']; + $mod .= genModule('fedora/35/php74/x86_64', $dest, '*rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/remi/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); - $mod .= genDefaults('php', false, ['remi-8.0', 'remi-8.1']); + $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']); createRepo($dest, $mod); $dest = 'fedora/35/debug-modular/x86_64'; @@ -464,6 +465,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f35', $_SERVER['argv'])) { $mod = ''; $deps = ['platform' => 'f35']; + $mod .= genModule('fedora/35/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/debug-remi/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); @@ -475,6 +477,7 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod = ''; $deps = ['platform' => 'f35']; + $mod .= genModule('fedora/35/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/test/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); @@ -485,6 +488,7 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod = ''; $deps = ['platform' => 'f35']; + $mod .= genModule('fedora/35/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/debug-test/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); -- cgit