summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--buildfct4
-rwxr-xr-xgetmock12
-rwxr-xr-xmkmodular12
3 files changed, 22 insertions, 6 deletions
diff --git a/buildfct b/buildfct
index 0c00f74..df96109 100644
--- a/buildfct
+++ b/buildfct
@@ -47,6 +47,7 @@ alias mockfc36xscl74=" mock --configdir=$mocketc -r fc36xscl74
alias mockfc36xscl80=" mock --configdir=$mocketc -r fc36xscl80 rebuild "
alias mockfc36xscl81=" mock --configdir=$mocketc -r fc36xscl81 rebuild "
alias mockfc36xscl82=" mock --configdir=$mocketc -r fc36xscl82 rebuild "
+alias mockfc36xr62=" mock --configdir=$mocketc -r fc36xr62 rebuild "
alias mockfc36xr70=" mock --configdir=$mocketc -r fc36xr70 rebuild "
alias mockfc36xm=" mock --configdir=$mocketc -r fc36xm rebuild "
@@ -117,7 +118,9 @@ alias mockel8xscl74=" mock --configdir=$mocketc -r el8xscl74 r
alias mockel8xscl80=" mock --configdir=$mocketc -r el8xscl80 rebuild "
alias mockel8xscl81=" mock --configdir=$mocketc -r el8xscl81 rebuild "
alias mockel8xscl82=" mock --configdir=$mocketc -r el8xscl82 rebuild "
+alias mockel8xr62=" mock --configdir=$mocketc -r el8xr62 rebuild "
alias mockel8xr70=" mock --configdir=$mocketc -r el8xr70 rebuild "
+alias mockel8xm=" mock --configdir=$mocketc -r el8xm rebuild "
alias mockel9x=" mock --configdir=$mocketc -r el9x rebuild "
alias mockel9xr=" mock --configdir=$mocketc -r el9xr rebuild "
@@ -129,6 +132,7 @@ alias mockel9xscl74=" mock --configdir=$mocketc -r el9xscl74 r
alias mockel9xscl80=" mock --configdir=$mocketc -r el9xscl80 rebuild "
alias mockel9xscl81=" mock --configdir=$mocketc -r el9xscl81 rebuild "
alias mockel9xscl82=" mock --configdir=$mocketc -r el9xscl82 rebuild "
+alias mockel9xr62=" mock --configdir=$mocketc -r el9xr62 rebuild "
alias mockel9xr70=" mock --configdir=$mocketc -r el9xr70 rebuild "
alias mockel9xm=" mock --configdir=$mocketc -r el9xm rebuild "
diff --git a/getmock b/getmock
index 329b1a2..4e08420 100755
--- a/getmock
+++ b/getmock
@@ -448,6 +448,17 @@ elif [ $1 = all81 ]; then
getOneMock el8x81 $opt '*8.1*'
getOneMock el9x81 $opt '*8.1*'
+elif [ $1 = allr62 ]; then
+ opt=remi
+ getOneMock fc34x $opt '*6.2*'
+ getOneMock fc35x $opt '*6.2*'
+ getOneMock el7x $opt '*6.2*'
+ opt=redis62
+ getOneMock fc36x $opt '*6.2*'
+ getOneMock el8x $opt '*6.2*'
+ getOneMock el9x $opt '*6.2*'
+ getOneMock el9a $opt '*6.2*'
+
elif [ $1 = allr70 ]; then
opt=remi
getOneMock fc34x $opt '*7.0*'
@@ -457,6 +468,7 @@ elif [ $1 = allr70 ]; then
getOneMock fc36x $opt '*7.0*'
getOneMock el8x $opt '*7.0*'
getOneMock el9x $opt '*7.0*'
+ getOneMock el9a $opt '*7.0*'
elif [ $1 = all54 ]; then
n=7
diff --git a/mkmodular b/mkmodular
index adeabc5..a641643 100755
--- a/mkmodular
+++ b/mkmodular
@@ -710,13 +710,13 @@ if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv'])) {
$mod .= genModule('enterprise/9/php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
$mod .= genModule('enterprise/9/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
$mod .= genModule('enterprise/9/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
- $mod .= genDefaults('php', false, ['remi-7.4']);
+ $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']);
// $mod .= genModule('enterprise/9/redis50/aarch64', $dest, 'redis*.rpm', '5.0', 'aarch64', $deps, $template_redis);
// $mod .= genModule('enterprise/9/redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis);
-// $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 .= genDefaults('redis', false, ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0']);
+ $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 .= genDefaults('redis', false, ['remi-6.2', 'remi-7.0']);
$mod .= genModule('enterprise/9/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
@@ -737,8 +737,8 @@ if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv'])) {
// $mod .= genModule('enterprise/9/debug-redis50/aarch64', $dest, 'redis*.rpm', '5.0', 'aarch64', $deps, $template_redis);
// $mod .= genModule('enterprise/9/debug-redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis);
-// $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-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-memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
createRepo($dest, $mod);