summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--buildfct6
-rwxr-xr-xgetmock30
-rwxr-xr-xmkmodular55
-rwxr-xr-xmockit16
4 files changed, 96 insertions, 11 deletions
diff --git a/buildfct b/buildfct
index 1a111ef..51f1c93 100644
--- a/buildfct
+++ b/buildfct
@@ -41,6 +41,7 @@ alias mockfc40xr60=" mock --configdir=$mocketc -r fc40xr60
alias mockfc40xr62=" mock --configdir=$mocketc -r fc40xr62 rebuild "
alias mockfc40xr70=" mock --configdir=$mocketc -r fc40xr70 rebuild "
alias mockfc40xr72=" mock --configdir=$mocketc -r fc40xr72 rebuild "
+alias mockfc40xr80=" mock --configdir=$mocketc -r fc40xr80 rebuild "
alias mockfc40xm=" mock --configdir=$mocketc -r fc40xm rebuild "
alias mockfc41x=" mock --configdir=$mocketc -r fc41x rebuild "
@@ -57,6 +58,7 @@ alias mockfc41xscl82=" mock --configdir=$mocketc -r fc41xscl82
alias mockfc41xscl83=" mock --configdir=$mocketc -r fc41xscl83 rebuild "
alias mockfc41xscl84=" mock --configdir=$mocketc -r fc41xscl84 rebuild "
alias mockfc41xscl85=" mock --configdir=$mocketc -r fc41xscl85 rebuild "
+alias mockfc41xr80=" mock --configdir=$mocketc -r fc41xr80 rebuild "
alias mockfc42x=" mock --configdir=$mocketc -r fc42x rebuild "
alias mockfc42x74=" mock --configdir=$mocketc -r fc42x74 rebuild "
@@ -72,6 +74,7 @@ alias mockfc42xscl82=" mock --configdir=$mocketc -r fc42xscl82
alias mockfc42xscl83=" mock --configdir=$mocketc -r fc42xscl83 rebuild "
alias mockfc42xscl84=" mock --configdir=$mocketc -r fc42xscl84 rebuild "
alias mockfc42xscl85=" mock --configdir=$mocketc -r fc42xscl85 rebuild "
+alias mockfc42xr80=" mock --configdir=$mocketc -r fc42xr80 rebuild "
alias mockel8x=" mock --configdir=$mocketc -r el8x rebuild "
alias mockel8xr=" mock --configdir=$mocketc -r el8xr rebuild "
@@ -102,6 +105,7 @@ alias mockel8xr60=" mock --configdir=$mocketc -r el8xr60 r
alias mockel8xr62=" mock --configdir=$mocketc -r el8xr62 rebuild "
alias mockel8xr70=" mock --configdir=$mocketc -r el8xr70 rebuild "
alias mockel8xr72=" mock --configdir=$mocketc -r el8xr72 rebuild "
+alias mockel8xr80=" mock --configdir=$mocketc -r el8xr80 rebuild "
## alias mockel8xm=" mock --configdir=$mocketc -r el8xm rebuild "
alias mockel9x=" mock --configdir=$mocketc -r el9x rebuild "
@@ -126,6 +130,7 @@ alias mockel9xr60=" mock --configdir=$mocketc -r el9xr60 r
alias mockel9xr62=" mock --configdir=$mocketc -r el9xr62 rebuild "
alias mockel9xr70=" mock --configdir=$mocketc -r el9xr70 rebuild "
alias mockel9xr72=" mock --configdir=$mocketc -r el9xr72 rebuild "
+alias mockel9xr80=" mock --configdir=$mocketc -r el9xr80 rebuild "
alias mockel9xm=" mock --configdir=$mocketc -r el9xm rebuild "
alias mockel10x=" mock --configdir=$mocketc -r el10x rebuild "
@@ -145,6 +150,7 @@ alias mockel10xscl82=" mock --configdir=$mocketc -r el10xscl82
alias mockel10xscl83=" mock --configdir=$mocketc -r el10xscl83 rebuild "
alias mockel10xscl84=" mock --configdir=$mocketc -r el10xscl84 rebuild "
alias mockel10xscl85=" mock --configdir=$mocketc -r el10xscl85 rebuild "
+alias mockel10xr80=" mock --configdir=$mocketc -r el10xr80 rebuild "
alias mockel10xm=" mock --configdir=$mocketc -r el10xm rebuild "
alias mockepel872=" mock --configdir=$mocketc -r epel872 rebuild "
diff --git a/getmock b/getmock
index e880e0c..333f31d 100755
--- a/getmock
+++ b/getmock
@@ -17,6 +17,9 @@ esac
rep=${2-remi}
case $dep in
+scl85el*) dep=${dep#scl85el}
+ type=enterprise
+ ;;
scl84el*) dep=${dep#scl84el}
type=enterprise
;;
@@ -256,6 +259,9 @@ el*) dep=${dep#el}
fc*) dep=${dep#fc}
type=fedora
;;
+scl85fc*) dep=${dep#scl85fc}
+ type=fedora
+ ;;
scl84fc*) dep=${dep#scl84fc}
type=fedora
;;
@@ -642,6 +648,21 @@ elif [ $1 = allr72 ]; then
getOneMock el9x $opt '*7.2*'
getOneMock el9a $opt '*7.2*'
+elif [ $1 = allr80 ]; then
+ opt=redis80
+ getOneMock fc40x $opt '*8.0*'
+ getOneMock fc40a $opt '*8.0*'
+ getOneMock fc41x $opt '*8.0*'
+ getOneMock fc41a $opt '*8.0*'
+ getOneMock fc42x $opt '*8.0*'
+ getOneMock fc42a $opt '*8.0*'
+ getOneMock el8x $opt '*8.0*'
+ getOneMock el8a $opt '*8.0*'
+ getOneMock el9x $opt '*8.0*'
+ getOneMock el9a $opt '*8.0*'
+ getOneMock el10x $opt '*8.0*'
+ getOneMock el10a $opt '*8.0*'
+
elif [ $1 = allm ]; then
opt=remi
getOneMock el8x $opt '*1.6*'
@@ -696,6 +717,13 @@ elif [ $1 = scl71 ]; then
getOneMock scl71el${i}x $opt
done
+elif [ $1 = scl85 ]; then
+ for dis in fc41 fc42 el8 el9 el10
+ do
+ getOneMock scl85${dis}x $opt
+ getOneMock scl85${dis}a $opt
+ done
+
elif [ $1 = scl84 ]; then
for dis in fc40 fc41 fc42 el8 el9 el10
do
@@ -755,7 +783,7 @@ elif [ $1 = scl72 ]; then
elif [ $1 = allphp ]; then
LOG=$(mktemp out.XXXXXXXXXX)
MOD="all72 all73 all74 all80 all81 all82 all83 all84"
- SCL="scl56 scl70 scl71 scl72 scl73 scl74 scl80 scl81 scl82 scl83 scl84"
+ SCL="scl56 scl70 scl71 scl72 scl73 scl74 scl80 scl81 scl82 scl83 scl84 scl85"
for i in $SCL $MOD
do $0 $opt $i | tee $LOG
if grep -q '64\.rpm' $LOG && grep -q 'pas un dossier mock' $LOG
diff --git a/mkmodular b/mkmodular
index 07ff6da..7e56ef8 100755
--- a/mkmodular
+++ b/mkmodular
@@ -554,7 +554,10 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array
$mod .= genModule('fedora/40/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/40/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/40/redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis);
- $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']);
+
+ $mod .= genModule('fedora/40/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
+ $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0']);
+
$mod .= genModule('fedora/40/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
createRepo($dest, $mod);
@@ -575,6 +578,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array
$mod .= genModule('fedora/40/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/40/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/40/debug-redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis);
+ $mod .= genModule('fedora/40/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/40/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
createRepo($dest, $mod);
}
@@ -626,7 +630,10 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array
$mod .= genModule('fedora/40/redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis);
$mod .= genModule('fedora/40/redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis);
$mod .= genModule('fedora/40/redis72/aarch64',$dest, '*.rpm', '7.2', 'aarch64', $deps, $template_redis);
- $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']);
+
+ $mod .= genModule('fedora/40/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
+ $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0']);
+
$mod .= genModule('fedora/40/memcached/aarch64',$dest, '*.rpm', false, 'aarch64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
createRepo($dest, $mod);
@@ -647,6 +654,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array
$mod .= genModule('fedora/40/debug-redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis);
$mod .= genModule('fedora/40/debug-redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis);
$mod .= genModule('fedora/40/debug-redis72/aarch64',$dest, '*.rpm', '7.2', 'aarch64', $deps, $template_redis);
+ $mod .= genModule('fedora/40/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
$mod .= genModule('fedora/40/debug-memcached/aarch64',$dest, '*.rpm', false, 'aarch64', $deps, $template_memcached);
createRepo($dest, $mod);
}
@@ -695,6 +703,9 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
$mod .= genModule('fedora/41/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
$mod .= genModule('fedora/41/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']);
+
+ $mod .= genModule('fedora/41/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
+ $mod .= genDefaults('redis', false, ['remi-8.0']);
createRepo($dest, $mod);
$dest = 'fedora/41/debug-modular/x86_64';
@@ -709,6 +720,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
$mod .= genModule('fedora/41/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
$mod .= genModule('fedora/41/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
$mod .= genModule('fedora/41/debug-php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/41/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
createRepo($dest, $mod);
}
if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -755,6 +767,9 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
$mod .= genModule('fedora/41/php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
$mod .= genModule('fedora/41/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']);
+
+ $mod .= genModule('fedora/41/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
+ $mod .= genDefaults('redis', false, ['remi-8.0']);
createRepo($dest, $mod);
$dest = 'fedora/41/debug-modular/aarch64';
@@ -769,6 +784,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
$mod .= genModule('fedora/41/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
$mod .= genModule('fedora/41/debug-php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
$mod .= genModule('fedora/41/debug-php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/41/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
createRepo($dest, $mod);
}
if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -816,6 +832,9 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array
$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']);
+
+ $mod .= genModule('fedora/42/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
+ $mod .= genDefaults('redis', false, ['remi-8.0']);
createRepo($dest, $mod);
$dest = 'fedora/42/debug-modular/x86_64';
@@ -830,6 +849,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array
$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);
+ $mod .= genModule('fedora/42/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
createRepo($dest, $mod);
}
if (in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -876,6 +896,9 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array
$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']);
+
+ $mod .= genModule('fedora/42/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
+ $mod .= genDefaults('redis', false, ['remi-8.0']);
createRepo($dest, $mod);
$dest = 'fedora/42/debug-modular/aarch64';
@@ -890,6 +913,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array
$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);
+ $mod .= genModule('fedora/42/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
createRepo($dest, $mod);
}
if (in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -984,7 +1008,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
$mod .= genModule('enterprise/8/redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/8/redis70/x86_64', $dest, 'redis*.rpm', '7.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/8/redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis);
- $mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']);
+ $mod .= genModule('enterprise/8/redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis);
+ $mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0']);
$deps = ['platform' => 'el8', 'php' => ''];
$mod .= genModule('enterprise/8/composer1/x86_64', $dest, '*.rpm', '1', 'x86_64', $deps, $template_comp);
@@ -1015,6 +1040,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
$mod .= genModule('enterprise/8/debug-redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/8/debug-redis70/x86_64', $dest, 'redis*.rpm', '7.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/8/debug-redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis);
+ $mod .= genModule('enterprise/8/debug-redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis);
createRepo($dest, $mod);
}
@@ -1078,7 +1104,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
$mod .= genModule('enterprise/8/redis62/aarch64', $dest, 'redis*.rpm', '6.2', 'aarch64', $deps, $template_redis);
$mod .= genModule('enterprise/8/redis70/aarch64', $dest, 'redis*.rpm', '7.0', 'aarch64', $deps, $template_redis);
$mod .= genModule('enterprise/8/redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis);
- $mod .= genDefaults('redis', '5', ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']);
+ $mod .= genModule('enterprise/8/redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis);
+ $mod .= genDefaults('redis', '5', ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0']);
$deps = ['platform' => 'el8', 'php' => ''];
$mod .= genModule('enterprise/8/composer1/x86_64', $dest, '*.rpm', '1', 'aarch64', $deps, $template_comp);
@@ -1108,6 +1135,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
$mod .= genModule('enterprise/8/debug-redis62/aarch64', $dest, 'redis*.rpm', '6.2', 'aarch64', $deps, $template_redis);
$mod .= genModule('enterprise/8/debug-redis70/aarch64', $dest, 'redis*.rpm', '7.0', 'aarch64', $deps, $template_redis);
$mod .= genModule('enterprise/8/debug-redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis);
+ $mod .= genModule('enterprise/8/debug-redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis);
createRepo($dest, $mod);
}
@@ -1165,7 +1193,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])
$mod .= genModule('enterprise/9/redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/9/redis70/x86_64', $dest, 'redis*.rpm', '7.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/9/redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis);
- $mod .= genDefaults('redis', false, ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']);
+ $mod .= genModule('enterprise/9/redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis);
+ $mod .= genDefaults('redis', false, ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0']);
$mod .= genModule('enterprise/9/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
@@ -1193,6 +1222,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
$mod .= genModule('enterprise/9/debug-redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/9/debug-redis70/x86_64', $dest, 'redis*.rpm', '7.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/9/debug-redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis);
+ $mod .= genModule('enterprise/9/debug-redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/9/debug-memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
createRepo($dest, $mod);
@@ -1219,7 +1249,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])
$mod .= genModule('enterprise/9/redis62/aarch64', $dest, 'redis*.rpm', '6.2', 'aarch64', $deps, $template_redis);
$mod .= genModule('enterprise/9/redis70/aarch64', $dest, 'redis*.rpm', '7.0', 'aarch64', $deps, $template_redis);
$mod .= genModule('enterprise/9/redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis);
- $mod .= genDefaults('redis', false, ['remi-6.2', 'remi-7.0', 'remi-7.2']);
+ $mod .= genModule('enterprise/9/redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis);
+ $mod .= genDefaults('redis', false, ['remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0']);
$mod .= genModule('enterprise/9/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
@@ -1247,6 +1278,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
$mod .= genModule('enterprise/9/debug-redis62/aarch64', $dest, 'redis*.rpm', '6.2', 'aarch64', $deps, $template_redis);
$mod .= genModule('enterprise/9/debug-redis70/aarch64', $dest, 'redis*.rpm', '7.0', 'aarch64', $deps, $template_redis);
$mod .= genModule('enterprise/9/debug-redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis);
+ $mod .= genModule('enterprise/9/debug-redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis);
$mod .= genModule('enterprise/9/debug-memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
createRepo($dest, $mod);
@@ -1295,7 +1327,7 @@ if (in_array('el10', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$mod .= genModule('enterprise/10/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
$mod .= genModule('enterprise/10/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
$mod .= genModule('enterprise/10/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
- $mod .= genModule('enterprise/100/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+ $mod .= genModule('enterprise/10/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
$mod .= genModule('enterprise/10/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
$mod .= genModule('enterprise/10/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
@@ -1334,6 +1366,9 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])
$mod .= genModule('enterprise/10/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']);
+ $mod .= genModule('enterprise/10/redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis);
+ $mod .= genDefaults('redis', false, ['remi-8.0']);
+
$mod .= genModule('enterprise/10/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
@@ -1360,6 +1395,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) {
$mod .= genModule('enterprise/10/debug-redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/10/debug-redis70/x86_64', $dest, 'redis*.rpm', '7.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/10/debug-redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis);
+ $mod .= genModule('enterprise/10/debug-redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/10/debug-memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
createRepo($dest, $mod);
@@ -1381,6 +1417,9 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])
$mod .= genModule('enterprise/10/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']);
+ $mod .= genModule('enterprise/10/redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis);
+ $mod .= genDefaults('redis', false, ['remi-8.0']);
+
$mod .= genModule('enterprise/10/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
@@ -1402,6 +1441,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) {
$mod .= genModule('enterprise/10/debug-php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
$mod .= genModule('enterprise/10/debug-php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+ $mod .= genModule('enterprise/10/debug-redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis);
+
$mod .= genModule('enterprise/10/debug-memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
createRepo($dest, $mod);
}
diff --git a/mockit b/mockit
index 0af54ca..780a555 100755
--- a/mockit
+++ b/mockit
@@ -91,13 +91,13 @@ else
fi
case $DIST in
- *x|*xm|*xr|*xr62|*xr72)
+ *x|*xm|*xr|*xr62|*xr72|*xr80)
if [ $SUF != x ]; then
echo "Not an x86_64 builder"
exit 1
fi
;;
- *a|*am|*ar|*ar62|*ar72)
+ *a|*am|*ar|*ar62|*ar72|*ar80)
if [ $SUF != a ]; then
if [ $REDIS -ge 1 ]; then
REMOTE=1
@@ -209,7 +209,17 @@ case $DIST in
echo Not supported for direct build
fi
;;
- r*)
+ r80)
+ if [ $REDIS -ge 1 ]; then
+ for i in fc42x fc41x fc40x el8x el9x el10x fc40a fc41a fc42a el8a el9a el10a
+ do
+ $0 --valkey --mock $SRPM ${i}${DIST} $MIN $MAX $@
+ done
+ else
+ echo Not supported for direct build
+ fi
+ ;;
+ r60|r62|r70|r72)
if [ $REDIS -ge 1 ]; then
for i in fc40x el8x el9x fc40a el8a el9a
do