summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-02-10 15:42:39 +0100
committerRemi Collet <remi@php.net>2022-02-10 15:42:39 +0100
commit1cc0ab69aeac26aa71609c948028dbf2266a4af3 (patch)
tree14a1096f2b991ad8c3e96b5d18871204e4855998
parent570ed9064e687d625e942344a6627d0c62f70e79 (diff)
fix modularity (F36)
-rw-r--r--buildfct2
-rwxr-xr-xmkmodular6
2 files changed, 4 insertions, 4 deletions
diff --git a/buildfct b/buildfct
index f2922c2..d5dc87d 100644
--- a/buildfct
+++ b/buildfct
@@ -270,7 +270,7 @@ fi
if [ -f "$1" ]; then
date +%X
pids=""
- for i in 34 35
+ for i in 34 35 36
do
echo -n ""
(mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo "$(date +%X) (7x) fc$i Ok." || echo "fc$1 Error !")&
diff --git a/mkmodular b/mkmodular
index 7da9171..474a973 100755
--- a/mkmodular
+++ b/mkmodular
@@ -521,7 +521,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f36', $_SERVER['argv'])) {
$deps = ['platform' => 'f36'];
$mod .= genModule('fedora/36/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/36/debug-remi/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/36/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
$mod .= genModule('fedora/36/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
createRepo($dest, $mod);
}
@@ -533,7 +533,7 @@ if (in_array('f36', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$deps = ['platform' => 'f36'];
$mod .= genModule('fedora/36/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/36/test/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/36/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
$mod .= genModule('fedora/36/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
createRepo($dest, $mod);
@@ -544,7 +544,7 @@ if (in_array('f36', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$deps = ['platform' => 'f36'];
$mod .= genModule('fedora/36/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/36/debug-test/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/36/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
$mod .= genModule('fedora/36/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
createRepo($dest, $mod);
}