summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--buildfct67
-rwxr-xr-xgetmock19
-rwxr-xr-xmkmodular30
3 files changed, 99 insertions, 17 deletions
diff --git a/buildfct b/buildfct
index b46381d..ecaba2a 100644
--- a/buildfct
+++ b/buildfct
@@ -53,6 +53,7 @@ alias mockfc36xscl82=" mock --configdir=$mocketc -r fc36xscl82
alias mockfc36xr60=" mock --configdir=$mocketc -r fc36xr60 rebuild "
alias mockfc36xr62=" mock --configdir=$mocketc -r fc36xr62 rebuild "
alias mockfc36xr70=" mock --configdir=$mocketc -r fc36xr70 rebuild "
+alias mockfc36xr72=" mock --configdir=$mocketc -r fc36xr72 rebuild "
alias mockfc36xm=" mock --configdir=$mocketc -r fc36xm rebuild "
alias mockfc37i=" setarch i686 mock --configdir=$mocketc -r fc37i --arch i686 rebuild "
@@ -70,6 +71,7 @@ alias mockfc37xscl82=" mock --configdir=$mocketc -r fc37xscl82
alias mockfc37xr60=" mock --configdir=$mocketc -r fc37xr60 rebuild "
alias mockfc37xr62=" mock --configdir=$mocketc -r fc37xr62 rebuild "
alias mockfc37xr70=" mock --configdir=$mocketc -r fc37xr70 rebuild "
+alias mockfc37xr72=" mock --configdir=$mocketc -r fc37xr72 rebuild "
alias mockfc37xm=" mock --configdir=$mocketc -r fc37xm rebuild "
alias mockfc38i=" setarch i686 mock --configdir=$mocketc -r fc38i --arch i686 rebuild "
@@ -87,6 +89,7 @@ alias mockfc38xscl82=" mock --configdir=$mocketc -r fc38xscl82
alias mockfc38xr60=" mock --configdir=$mocketc -r fc38xr60 rebuild "
alias mockfc38xr62=" mock --configdir=$mocketc -r fc38xr62 rebuild "
alias mockfc38xr70=" mock --configdir=$mocketc -r fc38xr70 rebuild "
+alias mockfc38xr72=" mock --configdir=$mocketc -r fc38xr72 rebuild "
alias mockfc38xm=" mock --configdir=$mocketc -r fc38xm rebuild "
alias mockel6i=" setarch i686 mock --configdir=$mocketc -r el6i --arch i686 rebuild "
@@ -162,7 +165,8 @@ alias mockel8xscl82=" mock --configdir=$mocketc -r el8xscl82 r
alias mockel8xr60=" mock --configdir=$mocketc -r el8xr60 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 mockel8xr72=" mock --configdir=$mocketc -r el8xr72 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 "
@@ -179,6 +183,7 @@ alias mockel9xscl82=" mock --configdir=$mocketc -r el9xscl82 r
alias mockel9xr60=" mock --configdir=$mocketc -r el9xr60 rebuild "
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 mockel9xm=" mock --configdir=$mocketc -r el9xm rebuild "
alias mockepel872=" mock --configdir=$mocketc -r epel872 rebuild "
@@ -524,7 +529,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 37 36
+ for i in 37 36 38
do
echo -n "$(date +%X) scl82 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -550,7 +555,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 37 36
+ for i in 37 38 36
do
echo -n "$(date +%X) scl81 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -566,6 +571,32 @@ else
fi
}
+# Build All distribution / version / 64bits for redis:remi-6.0
+mockr60x()
+{
+quiet=""
+if [ "$1" = "-q" ]; then
+ quiet="--quiet"
+ shift
+fi
+
+if [ -f "$1" ]; then
+ echo -n "$(date +%X) r60 f37 "
+ mock $quiet --configdir=$mocketc -r fc37xr60 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r60 f36 "
+ mock $quiet --configdir=$mocketc -r fc36xr60 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r60 el9 "
+ mock $quiet --configdir=$mocketc -r el9xr60 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r60 el8 "
+ mock $quiet --configdir=$mocketc -r el8xr60 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r60 el7 "
+ mock $quiet --configdir=$mocketc -r el7x rebuild "$@" && echo " Ok." || echo " Error !"
+ date +%X
+else
+ echo "file not found '$1'"
+fi
+}
+
# Build All distribution / version / 64bits for redis:remi-6.2
mockr62x()
{
@@ -593,6 +624,32 @@ fi
}
# Build All distribution / version / 64bits for redis:remi-7.0
+mockr72x()
+{
+quiet=""
+if [ "$1" = "-q" ]; then
+ quiet="--quiet"
+ shift
+fi
+
+if [ -f "$1" ]; then
+ echo -n "$(date +%X) r72 f37 "
+ mock $quiet --configdir=$mocketc -r fc37xr72 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r72 f36 "
+ mock $quiet --configdir=$mocketc -r fc36xr72 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r72 el9 "
+ mock $quiet --configdir=$mocketc -r el9xr72 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r72 el8 "
+ mock $quiet --configdir=$mocketc -r el8xr72 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r72 el7 "
+ mock $quiet --configdir=$mocketc -r el7x rebuild "$@" && echo " Ok." || echo " Error !"
+ date +%X
+else
+ echo "file not found '$1'"
+fi
+}
+
+# Build All distribution / version / 64bits for redis:remi-7.0
mockr70x()
{
quiet=""
@@ -706,7 +763,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 37 36
+ for i in 37 36 38
do
echo -n "$(date +%X) scl80 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -732,7 +789,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 37 36
+ for i in 37 38 36
do
echo -n "$(date +%X) scl74 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index ac369ea..0085cd7 100755
--- a/getmock
+++ b/getmock
@@ -515,6 +515,17 @@ elif [ $1 = allr70 ]; then
getOneMock el9x $opt '*7.0*'
getOneMock el9a $opt '*7.0*'
+elif [ $1 = allr72 ]; then
+ opt=remi
+ getOneMock el7x $opt '*7.2*'
+ opt=redis72
+ getOneMock fc36x $opt '*7.2*'
+ getOneMock fc37x $opt '*7.2*'
+ getOneMock fc38x $opt '*7.2*'
+ getOneMock el8x $opt '*7.2*'
+ getOneMock el9x $opt '*7.2*'
+ getOneMock el9a $opt '*7.2*'
+
elif [ $1 = allm ]; then
opt=remi
getOneMock el7x $opt '*1.6*'
@@ -583,7 +594,7 @@ elif [ $1 = scl71 ]; then
done
elif [ $1 = scl82 ]; then
- for i in 36 37
+ for i in 36 37 38
do
getOneMock scl82fc${i}x $opt
done
@@ -593,7 +604,7 @@ elif [ $1 = scl82 ]; then
done
elif [ $1 = scl81 ]; then
- for i in 36 37
+ for i in 36 37 38
do
getOneMock scl81fc${i}x $opt
done
@@ -603,7 +614,7 @@ elif [ $1 = scl81 ]; then
done
elif [ $1 = scl80 ]; then
- for i in 36 37
+ for i in 36 37 38
do
getOneMock scl80fc${i}x $opt
done
@@ -613,7 +624,7 @@ elif [ $1 = scl80 ]; then
done
elif [ $1 = scl74 ]; then
- for i in 36 37
+ for i in 36 37 38
do
getOneMock scl74fc${i}x $opt
done
diff --git a/mkmodular b/mkmodular
index 2fd1a5e..87eeead 100755
--- a/mkmodular
+++ b/mkmodular
@@ -453,7 +453,7 @@ if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$mod .= genModule('fedora/34/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
createRepo($dest, $mod);
}
-*/
+
if (count($_SERVER['argv']) < 2 || in_array('f35', $_SERVER['argv'])) {
$dest = 'fedora/35/modular/x86_64';
echo "Populate $dest\n";
@@ -505,6 +505,8 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$mod .= genModule('fedora/35/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
createRepo($dest, $mod);
}
+*/
+
if (count($_SERVER['argv']) < 2 || in_array('f36', $_SERVER['argv'])) {
$dest = 'fedora/36/modular/x86_64';
echo "Populate $dest\n";
@@ -520,7 +522,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f36', $_SERVER['argv'])) {
$mod .= genModule('fedora/36/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/36/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/36/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
- $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0']);
+ $mod .= genModule('fedora/36/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/36/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
createRepo($dest, $mod);
@@ -538,6 +541,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f36', $_SERVER['argv'])) {
$mod .= genModule('fedora/36/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/36/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/36/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
+ $mod .= genModule('fedora/36/debug-redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/36/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
createRepo($dest, $mod);
}
@@ -582,7 +586,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f37', $_SERVER['argv'])) {
$mod .= genModule('fedora/37/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/37/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/37/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
- $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0']);
+ $mod .= genModule('fedora/37/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/37/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
createRepo($dest, $mod);
@@ -600,6 +605,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f37', $_SERVER['argv'])) {
$mod .= genModule('fedora/37/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/37/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/37/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
+ $mod .= genModule('fedora/37/debug-redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/37/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
createRepo($dest, $mod);
}
@@ -644,7 +650,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f38', $_SERVER['argv'])) {
$mod .= genModule('fedora/38/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/38/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/38/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
- $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0']);
+ $mod .= genModule('fedora/38/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/38/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
createRepo($dest, $mod);
@@ -662,6 +669,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f38', $_SERVER['argv'])) {
$mod .= genModule('fedora/38/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/38/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/38/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
+ $mod .= genModule('fedora/38/debug-redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('fedora/38/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
createRepo($dest, $mod);
}
@@ -743,7 +751,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
$mod .= genModule('enterprise/8/redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
$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 .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0']);
+ $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']);
$deps = ['platform' => 'el8', 'php' => ''];
$mod .= genModule('enterprise/8/composer1/x86_64', $dest, '*.rpm', '1', 'x86_64', $deps, $template_comp);
@@ -769,6 +778,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
$mod .= genModule('enterprise/8/debug-redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
$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);
createRepo($dest, $mod);
}
@@ -818,7 +828,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
$mod .= genModule('enterprise/9/redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
$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 .= genDefaults('redis', false, ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0']);
+ $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/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
@@ -842,6 +853,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
$mod .= genModule('enterprise/9/debug-redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
$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-memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
createRepo($dest, $mod);
@@ -864,7 +876,8 @@ if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv'])) {
$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-6.2', 'remi-7.0']);
+ $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/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
$mod .= genDefaults('memcached', false, ['remi']);
@@ -888,6 +901,7 @@ if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv'])) {
$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-redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis);
$mod .= genModule('enterprise/9/debug-memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached);
createRepo($dest, $mod);
@@ -945,7 +959,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) {
$mod .= genModule('enterprise/7/remi/x86_64', $dest, 'redis*6.0*.rpm', '6.0', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/7/remi/x86_64', $dest, 'redis*6.2*.rpm', '6.2', 'x86_64', $deps, $template_redis);
$mod .= genModule('enterprise/7/remi/x86_64', $dest, 'redis*7.0*.rpm', '7.0', 'x86_64', $deps, $template_redis);
- $mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0']);
+ $mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']);
createRepo($dest, $mod);
}
echo "Done\n";