summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--buildfct5
-rwxr-xr-xgetmock13
-rwxr-xr-xmkmodular83
-rwxr-xr-xmockit14
4 files changed, 113 insertions, 2 deletions
diff --git a/buildfct b/buildfct
index 3a347f2..9cfa5fa 100644
--- a/buildfct
+++ b/buildfct
@@ -59,6 +59,7 @@ alias mockfc41xscl83=" mock --configdir=$mocketc -r fc41xscl83
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 mockfc41xv81=" mock --configdir=$mocketc -r fc41xv81 rebuild "
alias mockfc42x=" mock --configdir=$mocketc -r fc42x rebuild "
alias mockfc42x74=" mock --configdir=$mocketc -r fc42x74 rebuild "
@@ -75,6 +76,7 @@ alias mockfc42xscl83=" mock --configdir=$mocketc -r fc42xscl83
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 mockfc42xv81=" mock --configdir=$mocketc -r fc42xv81 rebuild "
alias mockel8x=" mock --configdir=$mocketc -r el8x rebuild "
alias mockel8xr=" mock --configdir=$mocketc -r el8xr rebuild "
@@ -106,6 +108,7 @@ alias mockel8xr62=" mock --configdir=$mocketc -r el8xr62 r
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 mockel8xv81=" mock --configdir=$mocketc -r el8xv81 rebuild "
## alias mockel8xm=" mock --configdir=$mocketc -r el8xm rebuild "
alias mockel9x=" mock --configdir=$mocketc -r el9x rebuild "
@@ -131,6 +134,7 @@ alias mockel9xr62=" mock --configdir=$mocketc -r el9xr62 r
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 mockel9xv81=" mock --configdir=$mocketc -r el9xv81 rebuild "
alias mockel9xm=" mock --configdir=$mocketc -r el9xm rebuild "
alias mockel10x=" mock --configdir=$mocketc -r el10x rebuild "
@@ -152,6 +156,7 @@ alias mockel10xscl84=" mock --configdir=$mocketc -r el10xscl84
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 mockel10xv81=" mock --configdir=$mocketc -r el10xv81 rebuild "
alias mockel10xm=" mock --configdir=$mocketc -r el10xm rebuild "
alias mockepel872=" mock --configdir=$mocketc -r epel872 rebuild "
diff --git a/getmock b/getmock
index d63bc64..f1f41e1 100755
--- a/getmock
+++ b/getmock
@@ -650,6 +650,19 @@ elif [ $1 = allr72 ]; then
getOneMock el10x $opt '*7.2*'
getOneMock el10a $opt '*7.2*'
+elif [ $1 = allv81 ]; then
+ opt=valkey81
+ getOneMock fc41x $opt '*module_valkey.8.1*'
+ getOneMock fc41a $opt '*module_valkey.8.1*'
+ getOneMock fc42x $opt '*module_valkey.8.1*'
+ getOneMock fc42a $opt '*module_valkey.8.1*'
+ getOneMock el8x $opt '*module_valkey.8.1*'
+ getOneMock el8a $opt '*module_valkey.8.1*'
+ getOneMock el9x $opt '*module_valkey.8.1*'
+ getOneMock el9a $opt '*module_valkey.8.1*'
+ getOneMock el10x $opt '*module_valkey.8.1*'
+ getOneMock el10a $opt '*module_valkey.8.1*'
+
elif [ $1 = allr80 ]; then
opt=redis80
getOneMock fc40x $opt '*8.0*'
diff --git a/mkmodular b/mkmodular
index 3b67f7e..61de312 100755
--- a/mkmodular
+++ b/mkmodular
@@ -155,6 +155,49 @@ data:
EOT;
+$template_valkey = <<< EOT
+---
+document: modulemd
+version: 2
+data:
+ name: valkey
+ stream: remi-@VERSION@
+ version: @DATE@
+ context: 00000000
+ arch: @ARCH@
+ summary: Valkey persistent key-value database
+ description: >-
+ Alternative valkey @VERSION@ module.
+ The remi-@VERSION@ stream provides more recent versions
+ and than default @VERSION@ stream.
+ license:
+ module:
+ - GPLv2+
+ content:
+ - BSD and MIT
+ - CC-BY-SA
+ dependencies:
+ - buildrequires:
+ platform: [@DIST@]
+ requires:
+@DEPS@
+ references:
+ documentation: https://valkey.io/docs/
+ tracker: https://github.com/valkey-io/valkey/issues
+ profiles:
+ common:
+ rpms:
+ - valkey
+ api:
+ rpms:
+ - valkey
+ artifacts:
+ rpms:
+@RPMS@
+...
+
+EOT;
+
$template_memcached = <<< EOT
---
document: modulemd
@@ -706,6 +749,9 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
$mod .= genModule('fedora/41/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
$mod .= genDefaults('redis', false, ['remi-8.0']);
+
+ $mod .= genModule('fedora/41/valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey);
+ $mod .= genDefaults('valkey', false, ['remi-8.1']);
createRepo($dest, $mod);
$dest = 'fedora/41/debug-modular/x86_64';
@@ -721,6 +767,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
$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);
+ $mod .= genModule('fedora/41/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey);
createRepo($dest, $mod);
}
if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -770,6 +817,9 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
$mod .= genModule('fedora/41/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
$mod .= genDefaults('redis', false, ['remi-8.0']);
+
+ $mod .= genModule('fedora/41/valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey);
+ $mod .= genDefaults('valkey', false, ['remi-8.1']);
createRepo($dest, $mod);
$dest = 'fedora/41/debug-modular/aarch64';
@@ -785,6 +835,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
$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);
+ $mod .= genModule('fedora/41/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey);
createRepo($dest, $mod);
}
if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -835,6 +886,9 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array
$mod .= genModule('fedora/42/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
$mod .= genDefaults('redis', false, ['remi-8.0']);
+
+ $mod .= genModule('fedora/42/valkey81/x86_64',$dest, '*.rpm', '8.1', 'x86_64', $deps, $template_valkey);
+ $mod .= genDefaults('valkey', false, ['remi-8.1']);
createRepo($dest, $mod);
$dest = 'fedora/42/debug-modular/x86_64';
@@ -850,6 +904,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array
$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);
+ $mod .= genModule('fedora/42/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey);
createRepo($dest, $mod);
}
if (in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -899,6 +954,9 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array
$mod .= genModule('fedora/42/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
$mod .= genDefaults('redis', false, ['remi-8.0']);
+
+ $mod .= genModule('fedora/42/valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey);
+ $mod .= genDefaults('valkey', false, ['remi-8.1']);
createRepo($dest, $mod);
$dest = 'fedora/42/debug-modular/aarch64';
@@ -914,6 +972,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array
$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);
+ $mod .= genModule('fedora/42/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey);
createRepo($dest, $mod);
}
if (in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -1011,6 +1070,9 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
$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']);
+ $mod .= genModule('enterprise/8/valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey);
+ $mod .= genDefaults('valkey', false, ['remi-8.1']);
+
$deps = ['platform' => 'el8', 'php' => ''];
$mod .= genModule('enterprise/8/composer1/x86_64', $dest, '*.rpm', '1', 'x86_64', $deps, $template_comp);
$mod .= genModule('enterprise/8/composer2/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp);
@@ -1041,6 +1103,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
$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);
+ $mod .= genModule('enterprise/8/debug-valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey);
createRepo($dest, $mod);
}
@@ -1107,6 +1170,9 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
$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']);
+ $mod .= genModule('enterprise/8/valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey);
+ $mod .= genDefaults('valkey', false, ['remi-8.1']);
+
$deps = ['platform' => 'el8', 'php' => ''];
$mod .= genModule('enterprise/8/composer1/x86_64', $dest, '*.rpm', '1', 'aarch64', $deps, $template_comp);
$mod .= genModule('enterprise/8/composer2/x86_64', $dest, '*.rpm', '2', 'aarch64', $deps, $template_comp);
@@ -1136,6 +1202,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
$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);
+ $mod .= genModule('enterprise/8/debug-valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey);
createRepo($dest, $mod);
}
@@ -1196,6 +1263,9 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])
$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/valkey81/x86_64', $dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey);
+ $mod .= genDefaults('valkey', false, ['remi-8.1']);
+
$mod .= genModule('enterprise/9/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
@@ -1223,6 +1293,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
$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-valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey);
$mod .= genModule('enterprise/9/debug-memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
createRepo($dest, $mod);
@@ -1252,6 +1323,9 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])
$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/valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey);
+ $mod .= genDefaults('valkey', false, ['remi-8.1']);
+
$mod .= genModule('enterprise/9/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
@@ -1279,6 +1353,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
$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-valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey);
$mod .= genModule('enterprise/9/debug-memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
createRepo($dest, $mod);
@@ -1370,6 +1445,9 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])
$mod .= genModule('enterprise/10/redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis);
$mod .= genDefaults('redis', false, ['remi-7.2', 'remi-8.0']);
+ $mod .= genModule('enterprise/10/valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey);
+ $mod .= genDefaults('valkey', false, ['remi-8.1']);
+
$mod .= genModule('enterprise/10/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
@@ -1398,6 +1476,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) {
$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-valkey81/x86_64',$dest, 'redis*.rpm', '8.1', 'x86_64', $deps, $template_valkey);
$mod .= genModule('enterprise/10/debug-memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
createRepo($dest, $mod);
@@ -1423,6 +1502,9 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])
$mod .= genModule('enterprise/10/redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis);
$mod .= genDefaults('redis', false, ['remi-7.2', 'remi-8.0']);
+ $mod .= genModule('enterprise/10/valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey);
+ $mod .= genDefaults('valkey', false, ['remi-8.1']);
+
$mod .= genModule('enterprise/10/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
@@ -1446,6 +1528,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) {
$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-valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey);
$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 3b66654..8125d92 100755
--- a/mockit
+++ b/mockit
@@ -91,13 +91,13 @@ else
fi
case $DIST in
- *x|*xm|*xr|*xr62|*xr72|*xr80)
+ *x|*xm|*xr|*xr62|*xr72|*xr80|*xv81)
if [ $SUF != x ]; then
echo "Not an x86_64 builder"
exit 1
fi
;;
- *a|*am|*ar|*ar62|*ar72|*ar80)
+ *a|*am|*ar|*ar62|*ar72|*ar80|*av81)
if [ $SUF != a ]; then
if [ $REDIS -ge 1 ]; then
REMOTE=1
@@ -213,6 +213,16 @@ case $DIST in
echo Not supported for direct build
fi
;;
+ v81)
+ if [ $REDIS -ge 1 ]; then
+ for i in fc42x fc41x el8x el9x el10x fc41a fc42a el8a el9a el10a
+ do
+ $0 --valkey --mock $SRPM ${i}${DIST} $MIN $MAX $@
+ done
+ else
+ echo Not supported for direct build
+ fi
+ ;;
r80)
if [ $REDIS -ge 1 ]; then
for i in fc42x fc41x fc40x el8x el9x el10x fc40a fc41a fc42a el8a el9a el10a
generated by cgit (git 2.34.1) at 2025-08-11 14:01:28 +0000