diff options
-rw-r--r-- | enterprise/7/index.html | 15 | ||||
-rw-r--r-- | enterprise/8/index.html | 15 | ||||
-rw-r--r-- | fedora/29/index.html | 26 | ||||
-rw-r--r-- | fedora/30/index.html | 30 | ||||
-rw-r--r-- | fedora/31/index.html | 26 | ||||
-rwxr-xr-x | mkmodular | 17 | ||||
-rw-r--r-- | wizard/index.php | 3 |
7 files changed, 129 insertions, 3 deletions
diff --git a/enterprise/7/index.html b/enterprise/7/index.html index 65f3f242..2c887035 100644 --- a/enterprise/7/index.html +++ b/enterprise/7/index.html @@ -42,6 +42,12 @@ <a href="remi/armhfp/repoview/" class="inpage">armhfp</a> (noarch only) </li> </ul> + <h3>remi-php74 (only PHP 7.4 and extensions)</h3> + <ul class="pkglist"> + <li> + <a href="php74/x86_64/repoview/" class="inpage">x86_64</a> + </li> + </ul> <h3>remi-php73 (only PHP 7.3 and extensions)</h3> <ul class="pkglist"> <li> @@ -89,6 +95,9 @@ <h3>Test packages, please try them</h3> <ul class="pkglist"> <li> + <a href="test74/x86_64/repoview/" class="inpage">PHP 7.4 - x86_64</a> + </li> + <li> <a href="test73/x86_64/repoview/" class="inpage">PHP 7.3 - x86_64</a> </li> <li> @@ -131,6 +140,9 @@ <a href="debug-php73/x86_64/repoview/" class="inpage">php73 - x86_64</a> </li> <li> + <a href="debug-php74/x86_64/repoview/" class="inpage">php74 - x86_64</a> + </li> + <li> <a href="debug-test/x86_64/repoview/" class="inpage">test - x86_64</a> </li> <li> @@ -145,6 +157,9 @@ <li> <a href="debug-test73/x86_64/repoview/" class="inpage">php73 - test - x86_64</a> </li> + <li> + <a href="debug-test74/x86_64/repoview/" class="inpage">php74 - test - x86_64</a> + </li> </ul> </div> </div> diff --git a/enterprise/8/index.html b/enterprise/8/index.html index 13212c6e..73745936 100644 --- a/enterprise/8/index.html +++ b/enterprise/8/index.html @@ -36,6 +36,12 @@ <a href="remi/x86_64/repoview/" class="inpage">x86_64</a> </li> </ul> + <h3>remi-php74 (only PHP 7.4 and extensions)</h3> + <ul class="pkglist"> + <li> + <a href="php73/x86_64/repoview/" class="inpage">x86_64</a> + </li> + </ul> <h3>remi-php73 (only PHP 7.3 and extensions)</h3> <ul class="pkglist"> <li> @@ -51,6 +57,9 @@ <h3>Test packages, please try them</h3> <ul class="pkglist"> <li> + <a href="test74/x86_64/repoview/" class="inpage">PHP 7.4 - x86_64</a> + </li> + <li> <a href="test73/x86_64/repoview/" class="inpage">PHP 7.3 - x86_64</a> </li> <li> @@ -69,6 +78,9 @@ <a href="debug-php73/x86_64/repoview/" class="inpage">php73 - x86_64</a> </li> <li> + <a href="debug-php74/x86_64/repoview/" class="inpage">php74 - x86_64</a> + </li> + <li> <a href="debug-test/x86_64/repoview/" class="inpage">test - x86_64</a> </li> <li> @@ -77,6 +89,9 @@ <li> <a href="debug-test73/x86_64/repoview/" class="inpage">php73 - test - x86_64</a> </li> + <li> + <a href="debug-test74/x86_64/repoview/" class="inpage">php74 - test - x86_64</a> + </li> </ul> </div> </div> diff --git a/fedora/29/index.html b/fedora/29/index.html index 06f12b99..2d12ee6c 100644 --- a/fedora/29/index.html +++ b/fedora/29/index.html @@ -40,6 +40,15 @@ <a href="remi/x86_64/repoview/" class="inpage">x86_64</a> </li> </ul> + <h3>remi-php74 (only PHP 7.4 and extensions, also needs remi)</h3> + <ul class="pkglist"> + <li> + <a href="php74/i386/repoview/" class="inpage">i386</a> + </li> + <li> + <a href="php74/x86_64/repoview/" class="inpage">x86_64</a> + </li> + </ul> <h3>remi-php73 (only PHP 7.3 and extensions, also needs remi)</h3> <ul class="pkglist"> <li> @@ -52,6 +61,12 @@ <h3>Test packages, please try them</h3> <ul class="pkglist"> <li> + <a href="test74/i386/repoview/" class="inpage">PHP 7.4 - i386</a> + </li> + <li> + <a href="test74/x86_64/repoview/" class="inpage">PHP 7.4 - x86_64</a> + </li> + <li> <a href="test73/i386/repoview/" class="inpage">PHP 7.3 - i386</a> </li> <li> @@ -79,6 +94,11 @@ <li> <a href="debug-remi/x86_64/repoview/" class="inpage">remi - x86_64</a> </li> + <li> + <a href="debug-php74/i386/repoview/" class="inpage">php74 - i386</a> + </li> + <li> + <a href="debug-php74/x86_64/repoview/" class="inpage">php74 - x86_64</a> </li> <li> <a href="debug-php73/i386/repoview/" class="inpage">php73 - i386</a> @@ -93,6 +113,12 @@ <a href="debug-test/x86_64/repoview/" class="inpage">test - x86_64</a> </li> <li> + <a href="debug-test74/i386/repoview/" class="inpage">php74 - test - i386</a> + </li> + <li> + <a href="debug-test74/x86_64/repoview/" class="inpage">php74 - test - x86_64</a> + </li> + <li> <a href="debug-test73/i386/repoview/" class="inpage">php73 - test - i386</a> </li> <li> diff --git a/fedora/30/index.html b/fedora/30/index.html index 2059ed81..ad6c47bd 100644 --- a/fedora/30/index.html +++ b/fedora/30/index.html @@ -40,13 +40,28 @@ <a href="remi/x86_64/repoview/" class="inpage">x86_64</a> </li> </ul> + <h3>remi-php74 (only PHP 7.4 and extensions, also needs remi)</h3> + <ul class="pkglist"> + <li> + <a href="php74/i386/repoview/" class="inpage">i386</a> + </li> + <li> + <a href="php74/x86_64/repoview/" class="inpage">x86_64</a> + </li> + </ul> <h3>Test packages, please try them</h3> <ul class="pkglist"> <li> - <a href="test/i386/repoview/" class="inpage">PHP 7.2 - i386</a> + <a href="test74/i386/repoview/" class="inpage">PHP 7.4 - i386</a> + </li> + <li> + <a href="test74/x86_64/repoview/" class="inpage">PHP 7.4 - x86_64</a> </li> <li> - <a href="test/x86_64/repoview/" class="inpage">PHP 7.2 - x86_64</a> + <a href="test/i386/repoview/" class="inpage">PHP 7.3 - i386</a> + </li> + <li> + <a href="test/x86_64/repoview/" class="inpage">PHP 7.3 - x86_64</a> </li> </ul> <h3>development</h3> @@ -64,6 +79,11 @@ <li> <a href="debug-remi/x86_64/repoview/" class="inpage">remi - x86_64</a> </li> + <li> + <a href="debug-php74/i386/repoview/" class="inpage">php74 - i386</a> + </li> + <li> + <a href="debug-php74/x86_64/repoview/" class="inpage">php74 - x86_64</a> </li> <li> <a href="debug-test/i386/repoview/" class="inpage">test - i386</a> @@ -71,6 +91,12 @@ <li> <a href="debug-test/x86_64/repoview/" class="inpage">test - x86_64</a> </li> + <li> + <a href="debug-test74/i386/repoview/" class="inpage">php74 - test - i386</a> + </li> + <li> + <a href="debug-test74/x86_64/repoview/" class="inpage">php74 - test - x86_64</a> + </li> </ul> </div> </div> diff --git a/fedora/31/index.html b/fedora/31/index.html index b845970f..0f6fff0a 100644 --- a/fedora/31/index.html +++ b/fedora/31/index.html @@ -40,9 +40,24 @@ <a href="remi/x86_64/repoview/" class="inpage">x86_64</a> </li> </ul> + <h3>remi-php74 (only PHP 7.4 and extensions, also needs remi)</h3> + <ul class="pkglist"> + <li> + <a href="php74/i386/repoview/" class="inpage">i386</a> + </li> + <li> + <a href="php74/x86_64/repoview/" class="inpage">x86_64</a> + </li> + </ul> <h3>Test packages, please try them</h3> <ul class="pkglist"> <li> + <a href="test74/i386/repoview/" class="inpage">PHP 7.4 - i386</a> + </li> + <li> + <a href="test74/x86_64/repoview/" class="inpage">PHP 7.4 - x86_64</a> + </li> + <li> <a href="test/i386/repoview/" class="inpage">PHP 7.2 - i386</a> </li> <li> @@ -64,6 +79,11 @@ <li> <a href="debug-remi/x86_64/repoview/" class="inpage">remi - x86_64</a> </li> + <li> + <a href="debug-php74/i386/repoview/" class="inpage">php74 - i386</a> + </li> + <li> + <a href="debug-php74/x86_64/repoview/" class="inpage">php74 - x86_64</a> </li> <li> <a href="debug-test/i386/repoview/" class="inpage">test - i386</a> @@ -71,6 +91,12 @@ <li> <a href="debug-test/x86_64/repoview/" class="inpage">test - x86_64</a> </li> + <li> + <a href="debug-test74/i386/repoview/" class="inpage">php74 - test - i386</a> + </li> + <li> + <a href="debug-test74/x86_64/repoview/" class="inpage">php74 - test - x86_64</a> + </li> </ul> </div> </div> @@ -159,6 +159,7 @@ data: remi-7.1: [common] remi-7.2: [common] remi-7.3: [common] + remi-7.4: [common] ... --- document: modulemd-defaults @@ -261,6 +262,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f29', $_SERVER['argv'])) { $deps = ['platform' => 'f29']; $mod = genModule('fedora/29/remi/x86_64', $dest, ['unit-php*rpm', 'php-*7.2*.rpm'], '7.2', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/29/php73/x86_64', $dest, '*.rpm', '7.3', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/29/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/29/glpi92/x86_64', $dest, '*.rpm', '9.2', 'x86_64', $deps, $template_glpi); $mod .= genModule('fedora/29/glpi93/x86_64', $dest, '*.rpm', '9.3', 'x86_64', $deps, $template_glpi); $mod .= genModule('fedora/29/glpi94/x86_64', $dest, '*.rpm', '9.4', 'x86_64', $deps, $template_glpi); @@ -273,6 +275,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f29', $_SERVER['argv'])) { $deps = ['platform' => 'f29']; $mod = genModule('fedora/29/test/x86_64', $dest, ['unit-php*rpm', 'php-*7.2*.rpm'], '7.2', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/29/test73/x86_64', $dest, '*.rpm', '7.3', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/29/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= $defaults; createRepo($dest, $mod); @@ -282,6 +285,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f29', $_SERVER['argv'])) { $deps = ['platform' => 'f29']; $mod = genModule('fedora/29/remi/i386', $dest, ['unit-php*rpm', 'php-*7.2*.rpm'], '7.2', 'i386', $deps, $template_php); $mod .= genModule('fedora/29/php73/i386', $dest, '*.rpm', '7.3', 'i386', $deps, $template_php); + $mod .= genModule('fedora/29/php74/i386', $dest, '*.rpm', '7.4', 'i386', $deps, $template_php); $mod .= genModule('fedora/29/glpi92/i386', $dest, '*.rpm', '9.2', 'i386', $deps, $template_glpi); $mod .= genModule('fedora/29/glpi93/i386', $dest, '*.rpm', '9.3', 'i386', $deps, $template_glpi); $mod .= genModule('fedora/29/glpi94/i386', $dest, '*.rpm', '9.4', 'i386', $deps, $template_glpi); @@ -294,6 +298,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f29', $_SERVER['argv'])) { $deps = ['platform' => 'f29']; $mod = genModule('fedora/29/test/i386', $dest, ['unit-php*rpm', 'php-*7.2*.rpm'], '7.2', 'i386', $deps, $template_php); $mod .= genModule('fedora/29/test73/i386', $dest, '*.rpm', '7.3', 'i386', $deps, $template_php); + $mod .= genModule('fedora/29/test74/i386', $dest, '*.rpm', '7.4', 'i386', $deps, $template_php); $mod .= $defaults; createRepo($dest, $mod); } @@ -304,6 +309,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f30', $_SERVER['argv'])) { cleanup($dest); $deps = ['platform' => 'f30']; $mod = genModule('fedora/30/remi/x86_64', $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/30/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/30/glpi93/x86_64', $dest, '*.rpm', '9.3', 'x86_64', $deps, $template_glpi); $mod .= genModule('fedora/30/glpi94/x86_64', $dest, '*.rpm', '9.4', 'x86_64', $deps, $template_glpi); $mod .= $defaults; @@ -314,6 +320,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f30', $_SERVER['argv'])) { cleanup($dest); $deps = ['platform' => 'f30']; $mod = genModule('fedora/30/test/x86_64', $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/30/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= $defaults; createRepo($dest, $mod); @@ -322,6 +329,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f30', $_SERVER['argv'])) { cleanup($dest); $deps = ['platform' => 'f30']; $mod = genModule('fedora/30/remi/i386', $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'i386', $deps, $template_php); + $mod .= genModule('fedora/30/php74/i386', $dest, '*.rpm', '7.4', 'i386', $deps, $template_php); $mod .= genModule('fedora/30/glpi93/i386', $dest, '*.rpm', '9.3', 'i386', $deps, $template_glpi); $mod .= genModule('fedora/30/glpi94/i386', $dest, '*.rpm', '9.4', 'i386', $deps, $template_glpi); $mod .= $defaults; @@ -332,6 +340,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f30', $_SERVER['argv'])) { cleanup($dest); $deps = ['platform' => 'f30']; $mod = genModule('fedora/30/test/i386', $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'i386', $deps, $template_php); + $mod .= genModule('fedora/30/test74/i386', $dest, '*.rpm', '7.4', 'i386', $deps, $template_php); $mod .= $defaults; createRepo($dest, $mod); } @@ -342,6 +351,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f31', $_SERVER['argv'])) { 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/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 .= $defaults; @@ -352,6 +362,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f31', $_SERVER['argv'])) { 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 .= $defaults; createRepo($dest, $mod); @@ -360,6 +371,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f31', $_SERVER['argv'])) { cleanup($dest); $deps = ['platform' => 'f31']; $mod = genModule('fedora/31/remi/i386', $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'i386', $deps, $template_php); + $mod .= genModule('fedora/31/php74/i386', $dest, '*.rpm', '7.4', 'i386', $deps, $template_php); $mod .= genModule('fedora/31/glpi93/i386', $dest, '*.rpm', '9.3', 'i386', $deps, $template_glpi); $mod .= genModule('fedora/31/glpi94/i386', $dest, '*.rpm', '9.4', 'i386', $deps, $template_glpi); $mod .= $defaults; @@ -370,6 +382,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f31', $_SERVER['argv'])) { cleanup($dest); $deps = ['platform' => 'f31']; $mod = genModule('fedora/31/test/i386', $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'i386', $deps, $template_php); + $mod .= genModule('fedora/31/test74/i386', $dest, '*.rpm', '7.4', 'i386', $deps, $template_php); $mod .= $defaults; createRepo($dest, $mod); } @@ -381,6 +394,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) { $deps = ['platform' => 'el8', 'nginx' => '1.14', 'httpd' => '2.4']; $mod = genModule('enterprise/8/test72/x86_64', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/test73/x86_64', $dest, '*.rpm', '7.3', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/8/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= $defaults; createRepo($dest, $mod); @@ -390,6 +404,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) { $deps = ['platform' => 'el8', 'nginx' => '1.14', 'httpd' => '2.4']; $mod = genModule('enterprise/8/php72/x86_64', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/php73/x86_64', $dest, '*.rpm', '7.3', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/8/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/remi/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/glpi93/x86_64', $dest, '*.rpm', '9.3', 'x86_64', $deps, $template_glpi); @@ -406,6 +421,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) { $mod = genModule('enterprise/7/test71/x86_64', $dest, '*.rpm', '7.1', 'x86_64', $deps, $template_php); $mod = genModule('enterprise/7/test72/x86_64', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/test73/x86_64', $dest, '*.rpm', '7.3', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/7/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= $defaults; createRepo($dest, $mod); @@ -416,6 +432,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) { $mod = genModule('enterprise/7/php71/x86_64', $dest, '*.rpm', '7.1', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/php72/x86_64', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/php73/x86_64', $dest, '*.rpm', '7.3', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/7/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/remi/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); $deps = ['platform' => 'el7', 'php' => '']; $mod .= genModule('enterprise/7/glpi92/x86_64', $dest, '*.rpm', '9.2', 'x86_64', $deps, $template_glpi); diff --git a/wizard/index.php b/wizard/index.php index 409c10c7..517537f9 100644 --- a/wizard/index.php +++ b/wizard/index.php @@ -64,7 +64,8 @@ $types = [ 'scl' => 'Multiple versions simultaneously', ]; $phpvers = [ - '7.4' => false, + // use false when only SCL + '7.4' => 'remi-php74', '7.3' => 'remi-php73', '7.2' => 'remi-php72', '7.1' => 'remi-php71', |