summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--buildfct12
-rwxr-xr-xgetmock12
-rwxr-xr-xmkmodular123
-rwxr-xr-xmockit2
4 files changed, 142 insertions, 7 deletions
diff --git a/buildfct b/buildfct
index d55b525..82a067a 100644
--- a/buildfct
+++ b/buildfct
@@ -351,7 +351,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 40
+ for i in 41 40 42
do
echo -n "$(date +%X) 74 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -561,7 +561,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 40
+ for i in 41 42 40
do
echo -n "$(date +%X) 84 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x84 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -587,7 +587,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 40
+ for i in 42 41 40
do
echo -n "$(date +%X) 83 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -634,7 +634,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 40
+ for i in 41 40 42
do
echo -n "$(date +%X) 82 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -660,7 +660,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 40
+ for i in 41 42 40
do
echo -n "$(date +%X) 81 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -686,7 +686,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 40
+ for i in 42 41 40
do
echo -n "$(date +%X) 80 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index aa0c226..7156e54 100755
--- a/getmock
+++ b/getmock
@@ -513,6 +513,8 @@ elif [ $1 = all73 ]; then
elif [ $1 = all74 ]; then
[ $opt = remi ] && opt=php74
[ $opt = test ] && opt=test74
+ getOneMock fc42x74 $opt '*7.4*'
+ getOneMock fc42a74 $opt '*7.4*'
getOneMock fc40x74 $opt '*7.4*'
getOneMock fc40a74 $opt '*7.4*'
getOneMock fc41x74 $opt '*7.4*'
@@ -527,6 +529,8 @@ elif [ $1 = all74 ]; then
elif [ $1 = all80 ]; then
[ $opt = remi ] && opt=php80
[ $opt = test ] && opt=test80
+ getOneMock fc42x80 $opt '*8.0*'
+ getOneMock fc42a80 $opt '*8.0*'
getOneMock fc40x80 $opt '*8.0*'
getOneMock fc40a80 $opt '*8.0*'
getOneMock fc41x80 $opt '*8.0*'
@@ -541,6 +545,8 @@ elif [ $1 = all80 ]; then
elif [ $1 = all81 ]; then
[ $opt = remi ] && opt=php81
[ $opt = test ] && opt=test81
+ getOneMock fc42x81 $opt '*8.1*'
+ getOneMock fc42a81 $opt '*8.1*'
getOneMock fc40x81 $opt '*8.1*'
getOneMock fc40a81 $opt '*8.1*'
getOneMock fc41x81 $opt '*8.1*'
@@ -555,6 +561,8 @@ elif [ $1 = all81 ]; then
elif [ $1 = all82 ]; then
[ $opt = remi ] && opt=php82
[ $opt = test ] && opt=test82
+ getOneMock fc42x82 $opt '*8.2*'
+ getOneMock fc42a82 $opt '*8.2*'
getOneMock fc40x82 $opt '*8.2*'
getOneMock fc40a82 $opt '*8.2*'
getOneMock fc41x82 $opt '*8.2*'
@@ -569,6 +577,8 @@ elif [ $1 = all82 ]; then
elif [ $1 = all83 ]; then
[ $opt = remi ] && opt=php83
[ $opt = test ] && opt=test83
+ getOneMock fc42x83 $opt '*8.3*'
+ getOneMock fc42a83 $opt '*8.3*'
getOneMock fc40x83 $opt '*8.3*'
getOneMock fc40a83 $opt '*8.3*'
getOneMock fc41x83 $opt '*8.3*'
@@ -583,6 +593,8 @@ elif [ $1 = all83 ]; then
elif [ $1 = all84 ]; then
[ $opt = remi ] && opt=php84
[ $opt = test ] && opt=test84
+ getOneMock fc42x84 $opt '*8.4*'
+ getOneMock fc42a84 $opt '*8.4*'
getOneMock fc40x84 $opt '*8.4*'
getOneMock fc40a84 $opt '*8.4*'
getOneMock fc41x84 $opt '*8.4*'
diff --git a/mkmodular b/mkmodular
index 11398a9..07ff6da 100755
--- a/mkmodular
+++ b/mkmodular
@@ -680,6 +680,7 @@ if (in_array('f40', $_SERVER['argv']) || in_array('f40a', $_SERVER['argv']) || i
createRepo($dest, $mod);
}
+// -------------- Fedora 41 -----------------------------------
if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv'])) {
$dest = 'fedora/41/modular/x86_64';
echo "Populate $dest\n";
@@ -800,6 +801,128 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || i
createRepo($dest, $mod);
}
+// -------------- Fedora 42 -----------------------------------
+if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv'])) {
+ $dest = 'fedora/42/modular/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+ $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
+ createRepo($dest, $mod);
+
+ $dest = 'fedora/42/debug-modular/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+ createRepo($dest, $mod);
+}
+if (in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+ $dest = 'fedora/42/modular-test/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+ createRepo($dest, $mod);
+
+ $dest = 'fedora/42/debug-modular-test/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+ createRepo($dest, $mod);
+}
+
+if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv'])) {
+ $dest = 'fedora/42/modular/aarch64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+ $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
+ createRepo($dest, $mod);
+
+ $dest = 'fedora/42/debug-modular/aarch64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/debug-php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+ createRepo($dest, $mod);
+}
+if (in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+ $dest = 'fedora/42/modular-test/aarch64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+ createRepo($dest, $mod);
+
+ $dest = 'fedora/42/debug-modular-test/aarch64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/debug-test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+ createRepo($dest, $mod);
+}
+
+
if (in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$dest = 'enterprise/8/modular-test/x86_64';
echo "Populate $dest\n";
diff --git a/mockit b/mockit
index b52437d..7cd3cfe 100755
--- a/mockit
+++ b/mockit
@@ -145,7 +145,7 @@ fi
echo mockit $SRPM $DIST $MIN $MAX $@
case $DIST in
fc42x|fc42a)
- LST=""
+ LST="74 80 81 82 83 84"
SCL=""
;;
fc40x|fc40a|fc41x|fc41a|el9x|el9a|el10x|el10a)