summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-04-16 11:25:17 +0200
committerRemi Collet <remi@remirepo.net>2021-04-16 11:25:17 +0200
commit1e44cf889fa2657a9e0e98c93356acf785bc5134 (patch)
tree6e420a82ba6679ef4448dab7f4548458f291d247
parenta19eab8b3def8f070f12be5b7faf8799d5f85fd3 (diff)
drop default stream for Fedora
-rwxr-xr-xgetmock6
-rwxr-xr-xmkmodular6
2 files changed, 6 insertions, 6 deletions
diff --git a/getmock b/getmock
index 680fb77..189bfac 100755
--- a/getmock
+++ b/getmock
@@ -186,9 +186,9 @@ do
[ -d ${cible}ppc64 -a ! -f ${cible}ppc64/.closed ] \
&& ln ${cible} /$j ${cible}ppc64/$j \
&& echo + $i linked ppc64
- [ -d ${cible}i386 ] \
- && ln ${cible}x86_64/$j ${cible}i386/$j \
- && echo + $i linked x86_64
+ #[ -d ${cible}i386 ] \
+ # && ln ${cible}x86_64/$j ${cible}i386/$j \
+ # && echo + $i linked x86_64
[ -d ${cible}armhfp ] \
&& ln ${cible}x86_64/$j ${cible}armhfp/$j \
&& echo + $i linked armhfp
diff --git a/mkmodular b/mkmodular
index 33a9e3b..e7aaf45 100755
--- a/mkmodular
+++ b/mkmodular
@@ -370,7 +370,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f32', $_SERVER['argv'])) {
$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', 'remi-7.4', ['remi-7.4', 'remi-8.0']);
+ #$mod .= genDefaults('php', 'remi-7.4', ['remi-7.4', 'remi-8.0']);
createRepo($dest, $mod);
}
if (in_array('f32', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -390,7 +390,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) {
$deps = ['platform' => 'f33'];
$mod = genModule('fedora/33/remi/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
$mod .= genModule('fedora/33/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
- $mod .= genDefaults('php', 'remi-7.4', ['remi-7.4', 'remi-8.0']);
+ #$mod .= genDefaults('php', 'remi-7.4', ['remi-7.4', 'remi-8.0']);
createRepo($dest, $mod);
}
if (in_array('f33', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -410,7 +410,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f34', $_SERVER['argv'])) {
$deps = ['platform' => 'f34'];
$mod = genModule('fedora/34/remi/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
$mod .= genModule('fedora/34/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
- $mod .= genDefaults('php', 'remi-7.4', ['remi-7.4', 'remi-8.0']);
+# $mod .= genDefaults('php', 'remi-7.4', ['remi-7.4', 'remi-8.0']);
createRepo($dest, $mod);
}
if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {