summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--buildfct1
-rwxr-xr-xgetmock2
-rwxr-xr-xmkmodular8
-rwxr-xr-xmockit22
4 files changed, 27 insertions, 6 deletions
diff --git a/buildfct b/buildfct
index 51f1c93..3a347f2 100644
--- a/buildfct
+++ b/buildfct
@@ -150,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 mockel10xr72=" mock --configdir=$mocketc -r el10xr72 rebuild "
alias mockel10xr80=" mock --configdir=$mocketc -r el10xr80 rebuild "
alias mockel10xm=" mock --configdir=$mocketc -r el10xm rebuild "
diff --git a/getmock b/getmock
index 333f31d..d63bc64 100755
--- a/getmock
+++ b/getmock
@@ -647,6 +647,8 @@ elif [ $1 = allr72 ]; then
getOneMock el8a $opt '*7.2*'
getOneMock el9x $opt '*7.2*'
getOneMock el9a $opt '*7.2*'
+ getOneMock el10x $opt '*7.2*'
+ getOneMock el10a $opt '*7.2*'
elif [ $1 = allr80 ]; then
opt=redis80
diff --git a/mkmodular b/mkmodular
index 7e56ef8..3b67f7e 100755
--- a/mkmodular
+++ b/mkmodular
@@ -1366,8 +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/redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis);
$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 .= genDefaults('redis', false, ['remi-7.2', 'remi-8.0']);
$mod .= genModule('enterprise/10/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
@@ -1395,6 +1396,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-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);
@@ -1417,8 +1419,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/redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis);
$mod .= genModule('enterprise/10/redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis);
- $mod .= genDefaults('redis', false, ['remi-8.0']);
+ $mod .= genDefaults('redis', false, ['remi-7.2', 'remi-8.0']);
$mod .= genModule('enterprise/10/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
@@ -1441,6 +1444,7 @@ 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-redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis);
$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);
diff --git a/mockit b/mockit
index 780a555..3b66654 100755
--- a/mockit
+++ b/mockit
@@ -145,17 +145,21 @@ fi
# PHP version matrix
echo mockit $SRPM $DIST $MIN $MAX $@
case $DIST in
- fc42x|fc42a|fc40x|fc40a|fc41x|fc41a|el9x|el9a|el10x|el10a)
+ fc40x|fc40a)
LST="74 80 81 82 83 84"
SCL="74 80 81 82 83 84"
;;
+ fc42x|fc42a|fc41x|fc41a|el9x|el9a|el10x|el10a)
+ LST="74 80 81 82 83 84"
+ SCL="74 80 81 82 83 84 85"
+ ;;
el8a)
LST="72 73 74 80 81 82 83 84"
- SCL="72 73 74 80 81 82 83 84"
+ SCL="72 73 74 80 81 82 83 84 85"
;;
el8x)
LST="72 73 74 80 81 82 83 84"
- SCL="56 70 71 72 73 74 80 81 82 83 84"
+ SCL="56 70 71 72 73 74 80 81 82 83 84 85"
;;
all)
if [ $REDIS -ge 1 ]; then
@@ -219,7 +223,17 @@ case $DIST in
echo Not supported for direct build
fi
;;
- r60|r62|r70|r72)
+ r72)
+ if [ $REDIS -ge 1 ]; then
+ for i in fc40x el8x el9x el10x fc40a el8a el9a el10a
+ do
+ $0 --valkey --mock $SRPM ${i}${DIST} $MIN $MAX $@
+ done
+ else
+ echo Not supported for direct build
+ fi
+ ;;
+ r60|r62|r70)
if [ $REDIS -ge 1 ]; then
for i in fc40x el8x el9x fc40a el8a el9a
do
generated by cgit (git 2.34.1) at 2025-07-11 01:46:27 +0000