summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--buildfct146
-rwxr-xr-xcleanoldrpm2
-rwxr-xr-xgetmock92
-rw-r--r--mirrorsync77
-rwxr-xr-xmkallrepo18
-rwxr-xr-xmkgit12
-rwxr-xr-xmkmodular130
-rwxr-xr-xmkrepo9
-rwxr-xr-xmockit98
-rwxr-xr-xpkgup2
10 files changed, 440 insertions, 146 deletions
diff --git a/buildfct b/buildfct
index a8c9476..1a111ef 100644
--- a/buildfct
+++ b/buildfct
@@ -56,6 +56,22 @@ alias mockfc41xscl81=" mock --configdir=$mocketc -r fc41xscl81
alias mockfc41xscl82=" mock --configdir=$mocketc -r fc41xscl82 rebuild "
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 mockfc42x=" mock --configdir=$mocketc -r fc42x rebuild "
+alias mockfc42x74=" mock --configdir=$mocketc -r fc42x74 rebuild "
+alias mockfc42x80=" mock --configdir=$mocketc -r fc42x80 rebuild "
+alias mockfc42x81=" mock --configdir=$mocketc -r fc42x81 rebuild "
+alias mockfc42x82=" mock --configdir=$mocketc -r fc42x82 rebuild "
+alias mockfc42x83=" mock --configdir=$mocketc -r fc42x83 rebuild "
+alias mockfc42x84=" mock --configdir=$mocketc -r fc42x84 rebuild "
+alias mockfc42xscl74=" mock --configdir=$mocketc -r fc42xscl74 rebuild "
+alias mockfc42xscl80=" mock --configdir=$mocketc -r fc42xscl80 rebuild "
+alias mockfc42xscl81=" mock --configdir=$mocketc -r fc42xscl81 rebuild "
+alias mockfc42xscl82=" mock --configdir=$mocketc -r fc42xscl82 rebuild "
+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 mockel8x=" mock --configdir=$mocketc -r el8x rebuild "
alias mockel8xr=" mock --configdir=$mocketc -r el8xr rebuild "
@@ -81,6 +97,7 @@ alias mockel8xscl81=" mock --configdir=$mocketc -r el8xscl81 r
alias mockel8xscl82=" mock --configdir=$mocketc -r el8xscl82 rebuild "
alias mockel8xscl83=" mock --configdir=$mocketc -r el8xscl83 rebuild "
alias mockel8xscl84=" mock --configdir=$mocketc -r el8xscl84 rebuild "
+alias mockel8xscl85=" mock --configdir=$mocketc -r el8xscl85 rebuild "
alias mockel8xr60=" mock --configdir=$mocketc -r el8xr60 rebuild "
alias mockel8xr62=" mock --configdir=$mocketc -r el8xr62 rebuild "
alias mockel8xr70=" mock --configdir=$mocketc -r el8xr70 rebuild "
@@ -104,6 +121,7 @@ alias mockel9xscl81=" mock --configdir=$mocketc -r el9xscl81 r
alias mockel9xscl82=" mock --configdir=$mocketc -r el9xscl82 rebuild "
alias mockel9xscl83=" mock --configdir=$mocketc -r el9xscl83 rebuild "
alias mockel9xscl84=" mock --configdir=$mocketc -r el9xscl84 rebuild "
+alias mockel9xscl85=" mock --configdir=$mocketc -r el9xscl85 rebuild "
alias mockel9xr60=" mock --configdir=$mocketc -r el9xr60 rebuild "
alias mockel9xr62=" mock --configdir=$mocketc -r el9xr62 rebuild "
alias mockel9xr70=" mock --configdir=$mocketc -r el9xr70 rebuild "
@@ -126,6 +144,7 @@ alias mockel10xscl81=" mock --configdir=$mocketc -r el10xscl81
alias mockel10xscl82=" mock --configdir=$mocketc -r el10xscl82 rebuild "
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 mockel10xm=" mock --configdir=$mocketc -r el10xm rebuild "
alias mockepel872=" mock --configdir=$mocketc -r epel872 rebuild "
@@ -168,13 +187,13 @@ if [ -f "$1" ]; then
date +%X
pids=""
echo -n ""
- (mock $quiet --configdir=$mocketc -r fc41x rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc40 Error !")&
+ (mock $quiet --configdir=$mocketc -r fc42x rebuild "$@" && echo "$(date +%X) (84) fc42 Ok." || echo "fc42 Error !")&
pids="$pids $!"
echo -n ""
- (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (83) fc40 Ok." || echo "fc40 Error !")&
+ (mock $quiet --configdir=$mocketc -r fc41x rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc41 Error !")&
pids="$pids $!"
echo -n ""
- (mock $quiet --configdir=$mocketc -r fc39x rebuild "$@" && echo "$(date +%X) (82) fc39 Ok." || echo "fc39 Error !")&
+ (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (83) fc40 Ok." || echo "fc40 Error !")&
pids="$pids $!"
echo -n ""
(mock $quiet --configdir=$mocketc -r el8n81 rebuild "$@" && echo "$(date +%X) (81) el8 Ok." || echo "el8 Error !")&
@@ -204,13 +223,13 @@ if [ -f "$1" ]; then
date +%X
pids=""
echo -n ""
- (mock $quiet --configdir=$mocketc -r fc41x rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc40 Error !")&
+ (mock $quiet --configdir=$mocketc -r fc42x rebuild "$@" && echo "$(date +%X) (84) fc42 Ok." || echo "fc42 Error !")&
pids="$pids $!"
echo -n ""
- (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (83) fc40 Ok." || echo "fc40 Error !")&
+ (mock $quiet --configdir=$mocketc -r fc41x rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc40 Error !")&
pids="$pids $!"
echo -n ""
- (mock $quiet --configdir=$mocketc -r fc39x rebuild "$@" && echo "$(date +%X) (82) fc39 Ok." || echo "fc39 Error !")&
+ (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (83) fc40 Ok." || echo "fc40 Error !")&
pids="$pids $!"
echo -n ""
(mock $quiet --configdir=$mocketc -r el8n82 rebuild "$@" && echo "$(date +%X) (81) el8 Ok." || echo "el8 Error !")&
@@ -228,6 +247,42 @@ else
fi
}
+# Build All distribution / version / noarch for remi using PHP >= 8.2
+mock83n()
+{
+quiet="--quiet"
+if [ "$1" = "-q" ]; then
+ shift
+fi
+
+if [ -f "$1" ]; then
+ date +%X
+ pids=""
+ echo -n ""
+ (mock $quiet --configdir=$mocketc -r fc42x rebuild "$@" && echo "$(date +%X) (84) fc42 Ok." || echo "fc42 Error !")&
+ pids="$pids $!"
+ echo -n ""
+ (mock $quiet --configdir=$mocketc -r fc41x rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc40 Error !")&
+ pids="$pids $!"
+ echo -n ""
+ (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (83) fc40 Ok." || echo "fc40 Error !")&
+ pids="$pids $!"
+ echo -n ""
+ (mock $quiet --configdir=$mocketc -r el8n83 rebuild "$@" && echo "$(date +%X) (83) el8 Ok." || echo "el8 Error !")&
+ pids="$pids $!"
+ echo -n ""
+ (mock $quiet --configdir=$mocketc -r el9n83 rebuild "$@" && echo "$(date +%X) (83) el9 Ok." || echo "el9 Error !")&
+ pids="$pids $!"
+ echo -n ""
+ (mock $quiet --configdir=$mocketc -r el10x rebuild "$@" && echo "$(date +%X) (83) el10 Ok." || echo "el10 Error !")&
+ pids="$pids $!"
+ wait $pids
+ date +%X
+else
+ echo "file not found '$1'"
+fi
+}
+
# Build All EL distributions
mockel()
{
@@ -301,7 +356,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 39 40
+ for i in 41 40 42
do
echo -n "$(date +%X) 74 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -318,6 +373,32 @@ fi
}
# Build All distribution / version / 64bits for remi/scl-php84
+mockscl85x()
+{
+quiet=""
+if [ "$1" = "-q" ]; then
+ quiet="--quiet"
+ shift
+fi
+
+if [ -f "$1" ]; then
+ for i in 42 41
+ do
+ echo -n "$(date +%X) scl85 fc$i "
+ mock $quiet --configdir=$mocketc -r fc${i}xscl85 rebuild "$@" && echo " Ok." || echo " Error !"
+ done
+ for i in 8 9 10
+ do
+ echo -n "$(date +%X) scl85 el$i "
+ mock $quiet --configdir=$mocketc -r el${i}xscl85 rebuild "$@" && echo " Ok." || echo " Error !"
+ done
+ date +%X
+else
+ echo "file not found '$1'"
+fi
+}
+
+# Build All distribution / version / 64bits for remi/scl-php84
mockscl84x()
{
quiet=""
@@ -327,7 +408,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 39 40
+ for i in 42 41 40
do
echo -n "$(date +%X) scl84 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl84 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -353,7 +434,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 40 39
+ for i in 41 42 40
do
echo -n "$(date +%X) scl83 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -379,7 +460,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 39 40
+ for i in 41 40 42
do
echo -n "$(date +%X) scl82 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -405,7 +486,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 40 39
+ for i in 42 41 40
do
echo -n "$(date +%X) scl81 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -431,8 +512,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) r60 f39 "
- mock $quiet --configdir=$mocketc -r fc39xr60 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 "
@@ -453,8 +532,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) r62 f39 "
- mock $quiet --configdir=$mocketc -r fc39xr62 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r62 el9 "
mock $quiet --configdir=$mocketc -r el9xr62 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r62 el8 "
@@ -475,8 +552,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) r72 f39 "
- mock $quiet --configdir=$mocketc -r fc39xr72 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 "
@@ -497,8 +572,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) r70 f39 "
- mock $quiet --configdir=$mocketc -r fc39xr70 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r70 el9 "
mock $quiet --configdir=$mocketc -r el9xr70 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r70 el8 "
@@ -519,7 +592,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 40 39
+ for i in 41 42 40
do
echo -n "$(date +%X) 84 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x84 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -545,7 +618,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 40 39
+ for i in 42 41 40
do
echo -n "$(date +%X) 83 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -582,27 +655,6 @@ else
fi
}
-# Build All distribution / version / 64bits for remi/remi-php83
-mock83fc()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
- quiet="--quiet"
- shift
-fi
-
-if [ -f "$1" ]; then
- for i in 39
- do
- echo -n "$(date +%X) 83 fc$i "
- mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !"
- done
- date +%X
-else
- echo "file not found '$1'"
-fi
-}
-
# Build All distribution / version / 64bits for remi/remi-php82
mock82x()
{
@@ -613,7 +665,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 40 39
+ for i in 41 40 42
do
echo -n "$(date +%X) 82 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -639,7 +691,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 40 39
+ for i in 41 42 40
do
echo -n "$(date +%X) 81 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -665,7 +717,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 39 40
+ for i in 42 41 40
do
echo -n "$(date +%X) 80 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -691,7 +743,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 39 40
+ for i in 41 42 40
do
echo -n "$(date +%X) scl80 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -717,7 +769,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 41 40 39
+ for i in 41 40 42
do
echo -n "$(date +%X) scl74 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/cleanoldrpm b/cleanoldrpm
index cf3a368..e4ee205 100755
--- a/cleanoldrpm
+++ b/cleanoldrpm
@@ -12,6 +12,7 @@ $multi = [
'php81-php-pecl-protobuf' => 1,
'php82-php-pecl-protobuf' => 1,
'php83-php-pecl-protobuf' => 1,
+ 'php84-php-pecl-protobuf' => 1,
'njs' => 99, // njs/0.8.2
'libnjs-devel' => 99, //
'redis' => 3, // redis/6.2
@@ -25,6 +26,7 @@ $multi = [
'phan' => 1, // phan/3
'roundcubemail' => 4, // roundcubemail/1.x.
'remi-release' => 3, // remi-release/8.5
+ 'php-pear-PHP-CodeSniffer' => 1,
];
if (isset($_SERVER['argv'][1])) {
$keep = (int)$_SERVER['argv'][1];
diff --git a/getmock b/getmock
index 11ff924..e880e0c 100755
--- a/getmock
+++ b/getmock
@@ -285,7 +285,7 @@ then
debug=$type/$dep/debug-$rep/
else
echo "$1 n'est pas un dépôt ($type/$dep/$rep)"
- exit 2
+ return
fi
if [ -d /var/lib/mock/${1}/repodata ]; then
@@ -297,8 +297,8 @@ elif [ -d /var/lib/mock/${1}i/result ]; then
elif [ -d /var/lib/mock/$1/result ]; then
src=/var/lib/mock/$1/result
else
- echo "$1 n'est pas un dossier mock"
- exit 2
+ echo "$1 n'est pas un dossier mock (missing repodata or result)"
+ return
fi
echo Copie de $src vers $cible
@@ -339,6 +339,13 @@ do
cp $i priv/fc41.x86_64 && echo + $i copied priv FC41
fi
;;
+ remi-crypto*fc42*)
+ if [ -f priv/fc42.x86_64/$j ]; then
+ echo " " $i already there
+ else
+ cp $i priv/fc42.x86_64 && echo + $i copied priv FC42
+ fi
+ ;;
remi-crypto*fc40*)
if [ -f priv/fc40.x86_64/$j ]; then
echo " " $i already there
@@ -506,8 +513,8 @@ elif [ $1 = all73 ]; then
elif [ $1 = all74 ]; then
[ $opt = remi ] && opt=php74
[ $opt = test ] && opt=test74
- getOneMock fc39x74 $opt '*7.4*'
- getOneMock fc39a74 $opt '*7.4*'
+ getOneMock fc42x74 $opt '*7.4*'
+ getOneMock fc42a74 $opt '*7.4*'
getOneMock fc40x74 $opt '*7.4*'
getOneMock fc40a74 $opt '*7.4*'
getOneMock fc41x74 $opt '*7.4*'
@@ -522,8 +529,8 @@ elif [ $1 = all74 ]; then
elif [ $1 = all80 ]; then
[ $opt = remi ] && opt=php80
[ $opt = test ] && opt=test80
- getOneMock fc39x80 $opt '*8.0*'
- getOneMock fc39a80 $opt '*8.0*'
+ getOneMock fc42x80 $opt '*8.0*'
+ getOneMock fc42a80 $opt '*8.0*'
getOneMock fc40x80 $opt '*8.0*'
getOneMock fc40a80 $opt '*8.0*'
getOneMock fc41x80 $opt '*8.0*'
@@ -538,8 +545,8 @@ elif [ $1 = all80 ]; then
elif [ $1 = all81 ]; then
[ $opt = remi ] && opt=php81
[ $opt = test ] && opt=test81
- getOneMock fc39x81 $opt '*8.1*'
- getOneMock fc39a81 $opt '*8.1*'
+ getOneMock fc42x81 $opt '*8.1*'
+ getOneMock fc42a81 $opt '*8.1*'
getOneMock fc40x81 $opt '*8.1*'
getOneMock fc40a81 $opt '*8.1*'
getOneMock fc41x81 $opt '*8.1*'
@@ -554,8 +561,8 @@ elif [ $1 = all81 ]; then
elif [ $1 = all82 ]; then
[ $opt = remi ] && opt=php82
[ $opt = test ] && opt=test82
- getOneMock fc39x82 $opt '*8.2*'
- getOneMock fc39a82 $opt '*8.2*'
+ getOneMock fc42x82 $opt '*8.2*'
+ getOneMock fc42a82 $opt '*8.2*'
getOneMock fc40x82 $opt '*8.2*'
getOneMock fc40a82 $opt '*8.2*'
getOneMock fc41x82 $opt '*8.2*'
@@ -570,8 +577,8 @@ elif [ $1 = all82 ]; then
elif [ $1 = all83 ]; then
[ $opt = remi ] && opt=php83
[ $opt = test ] && opt=test83
- getOneMock fc39x83 $opt '*8.3*'
- getOneMock fc39a83 $opt '*8.3*'
+ getOneMock fc42x83 $opt '*8.3*'
+ getOneMock fc42a83 $opt '*8.3*'
getOneMock fc40x83 $opt '*8.3*'
getOneMock fc40a83 $opt '*8.3*'
getOneMock fc41x83 $opt '*8.3*'
@@ -586,8 +593,8 @@ elif [ $1 = all83 ]; then
elif [ $1 = all84 ]; then
[ $opt = remi ] && opt=php84
[ $opt = test ] && opt=test84
- getOneMock fc39x84 $opt '*8.4*'
- getOneMock fc39a84 $opt '*8.4*'
+ getOneMock fc42x84 $opt '*8.4*'
+ getOneMock fc42a84 $opt '*8.4*'
getOneMock fc40x84 $opt '*8.4*'
getOneMock fc40a84 $opt '*8.4*'
getOneMock fc41x84 $opt '*8.4*'
@@ -601,8 +608,6 @@ elif [ $1 = all84 ]; then
elif [ $1 = allr60 ]; then
opt=redis60
- getOneMock fc39x $opt '*6.0*'
- getOneMock fc39a $opt '*6.0*'
getOneMock fc40x $opt '*6.0*'
getOneMock fc40a $opt '*6.0*'
getOneMock el8x $opt '*6.0*'
@@ -612,8 +617,6 @@ elif [ $1 = allr60 ]; then
elif [ $1 = allr62 ]; then
opt=redis62
- getOneMock fc39x $opt '*6.2*'
- getOneMock fc39a $opt '*6.2*'
getOneMock fc40x $opt '*6.2*'
getOneMock fc40a $opt '*6.2*'
getOneMock el8x $opt '*6.2*'
@@ -623,8 +626,6 @@ elif [ $1 = allr62 ]; then
elif [ $1 = allr70 ]; then
opt=redis70
- getOneMock fc39x $opt '*7.0*'
- getOneMock fc39a $opt '*7.0*'
getOneMock fc40x $opt '*7.0*'
getOneMock fc40a $opt '*7.0*'
getOneMock el8x $opt '*7.0*'
@@ -634,8 +635,6 @@ elif [ $1 = allr70 ]; then
elif [ $1 = allr72 ]; then
opt=redis72
- getOneMock fc39x $opt '*7.2*'
- getOneMock fc39a $opt '*7.2*'
getOneMock fc40x $opt '*7.2*'
getOneMock fc40a $opt '*7.2*'
getOneMock el8x $opt '*7.2*'
@@ -649,9 +648,9 @@ elif [ $1 = allm ]; then
getOneMock el8a $opt '*1.6*'
getOneMock fc41x $opt '*1.6*'
getOneMock fc41a $opt '*1.6*'
+ getOneMock fc42x $opt '*1.6*'
+ getOneMock fc42a $opt '*1.6*'
opt=memcached
- getOneMock fc39x $opt '*1.6*'
- getOneMock fc39a $opt '*1.6*'
getOneMock fc40x $opt '*1.6*'
getOneMock fc40a $opt '*1.6*'
getOneMock el9x $opt '*1.6*'
@@ -660,23 +659,23 @@ elif [ $1 = allm ]; then
getOneMock el10a $opt '*1.6*'
elif [ $1 = allx ]; then
- for i in 39 40 41
+ for i in 8 9 10
do
- getOneMock fc${i}x $opt
+ (getOneMock el${i}x $opt)
done
- for i in 8 9 10
+ for i in 40 41 42
do
- getOneMock el${i}x $opt
+ (getOneMock fc${i}x $opt)
done
elif [ $1 = alla ]; then
- for i in 39 40 41
+ for i in 8 9 10
do
- getOneMock fc${i}a $opt
+ (getOneMock el${i}a $opt)
done
- for i in 8 9 10
+ for i in 40 41 42
do
- getOneMock el${i}a $opt
+ (getOneMock fc${i}a $opt)
done
elif [ $1 = scl56 ]; then
@@ -698,42 +697,42 @@ elif [ $1 = scl71 ]; then
done
elif [ $1 = scl84 ]; then
- for dis in fc39 fc40 fc41 el8 el9 el10
+ for dis in fc40 fc41 fc42 el8 el9 el10
do
getOneMock scl84${dis}x $opt
getOneMock scl84${dis}a $opt
done
elif [ $1 = scl83 ]; then
- for dis in fc39 fc40 fc41 el8 el9 el10
+ for dis in fc40 fc41 fc42 el8 el9 el10
do
getOneMock scl83${dis}x $opt
getOneMock scl83${dis}a $opt
done
elif [ $1 = scl82 ]; then
- for dis in fc39 fc40 fc41 el8 el9 el10
+ for dis in fc40 fc41 fc42 el8 el9 el10
do
getOneMock scl82${dis}x $opt
getOneMock scl82${dis}a $opt
done
elif [ $1 = scl81 ]; then
- for dis in fc39 fc40 fc41 el8 el9 el10
+ for dis in fc40 fc41 fc42 el8 el9 el10
do
getOneMock scl81${dis}x $opt
getOneMock scl81${dis}a $opt
done
elif [ $1 = scl80 ]; then
- for dis in fc39 fc40 fc41 el8 el9 el10
+ for dis in fc42 fc40 fc41 el8 el9 el10
do
getOneMock scl80${dis}x $opt
getOneMock scl80${dis}a $opt
done
elif [ $1 = scl74 ]; then
- for dis in fc39 fc40 fc41 el8 el9 el10
+ for dis in fc42 fc40 fc41 el8 el9 el10
do
getOneMock scl74${dis}x $opt
getOneMock scl74${dis}a $opt
@@ -759,12 +758,25 @@ elif [ $1 = allphp ]; then
SCL="scl56 scl70 scl71 scl72 scl73 scl74 scl80 scl81 scl82 scl83 scl84"
for i in $SCL $MOD
do $0 $opt $i | tee $LOG
- if grep -q '64\.rpm' $LOG && grep -q 'Aucun' $LOG
+ if grep -q '64\.rpm' $LOG && grep -q 'pas un dossier mock' $LOG
then
echo -en "\n> $i - [enter] >"; read rep
fi
done
rm -f $LOG
+elif [ $1 = all42 ]; then
+ LOG=$(mktemp out.XXXXXXXXXX)
+ MOD="74 80 81 82 83 84"
+ for v in $MOD; do
+ for i in fc42x${v} fc42a${v} scl${v}fc42x scl${v}fc42a; do
+ $0 $opt $i | tee $LOG
+ if grep -q '64\.rpm' $LOG && grep -q 'pas un dossier mock' $LOG
+ then
+ echo -en "\n> $i - [enter] >"; read rep
+ fi
+ done
+ done
+ rm -f $LOG
else
for i in $*
do
diff --git a/mirrorsync b/mirrorsync
index 002b840..4661877 100644
--- a/mirrorsync
+++ b/mirrorsync
@@ -32,20 +32,6 @@
# SOFTWARE.
#
-# Find rsync in default path
-rsync_run(){
- if command -v rsync >/dev/null; then
- command rsync "$@";
- else
- command -p rsync "$@";
- fi;
-}
-
-# You can change v to q if you do not want detailed logging
-# You may also add additional excludes if you don't want to provide certain
-# repositories or architectures.
-opts=(-avSH --exclude="*.~tmp~" --delete-delay --delay-updates)
-
# Please use a mirror geographically close to you for initial sync,
# or if you are hosting a private mirror (not publicly available).
#
@@ -57,24 +43,52 @@ opts=(-avSH --exclude="*.~tmp~" --delete-delay --delay-updates)
# A complete list of mirrors can be found at
# https://rpms.remirepo.net/
-# Enterprise repo source
-src1="rsync://rpms.remirepo.net/enterprise"
-# Fedora repo source
-src2="rsync://rpms.remirepo.net/fedora"
-
+##### TO BE ADAPTED TO YOUR CONFIGURATION #####
+# sync from primary mirror only allowed to official mirrors
+src="rsync://rpms.remirepo.net"
# Your local path. Change to whatever fits your system.
+dst=/mnt/RepoSync
# $mirrormodule is also used in syslog output.
+# ${dst}/${mirrormodule}/enterprise MUST exists
+# ${dst}/${mirrormodule}/fedora MUST exists
mirrormodule="Remi"
-dst1="/mnt/RepoSync/${mirrormodule}/enterprise"
-dst2="/mnt/RepoSync/${mirrormodule}/fedora"
+# You can change v to q if you do not want detailed logging
+# You may also add additional excludes if you don't want to provide certain
+# repositories or architectures.
+opts=(-avSH --exclude="*.~tmp~" --delete-delay --delay-updates)
+##### END OF TO BE ADAPTED #####
+
+# Enterprise repo
+src1="${src}/enterprise"
+dst1="${dst}/${mirrormodule}/enterprise"
+# Fedora repo
+src2="${src}/fedora"
+dst2="${dst}/${mirrormodule}/fedora"
datefile="date"
lockfile="$0.lockfile"
logfile="$0.log"
+# Find rsync in default path
+rsync_run(){
+ if command -v rsync >/dev/null; then
+ command rsync "$@";
+ else
+ command -p rsync "$@";
+ fi;
+}
+
+if [ ! -d ${dst1} ]; then
+ echo "${dst1} directory does not exist"
+ exit 1
+fi
+if [ ! -d ${dst2} ]; then
+ echo "${dst2} directory does not exist"
+ exit 1
+fi
# Always pull the index.html to ensure the latest. curl/wget would still use same bandiwdth to check if the page changed even
# if we aren't going to save a new copy
-wget https://rpms.remirepo.net/index.html -O /mnt/RepoSync/${mirrormodule}/index.html
+wget https://rpms.remirepo.net/index.html -O ${dst}/${mirrormodule}/index.html >> "$logfile" 2>&1
# Check if the datefile has changed on upstream mirror
# and exit cleanly if it is still the same
@@ -106,19 +120,28 @@ fi
# The actual syncing part
printf '%s\n' "$$" > "$lockfile"
printf "Started update at %(%c)T\n" -1 >> "$logfile" 2>&1
-logger -t rsync "Updating ${mirrormodule}"
-
# Sync src1/dst1 if there are changes
if [[ -n "$checkresult1" ]]; then
- rsync_run "${opts[@]}" "${src1}/" "${dst1}/" >> "$logfile" 2>&1
+ logger -t rsync "Updating ${mirrormodule} for ${dst1}"
+ if rsync_run "${opts[@]}" "${src1}/" "${dst1}/" >> "$logfile" 2>&1; then
+ logger -t rsync "Succeed updating ${mirrormodule}"
+ else
+ logger -t rsync "Failed updating ${mirrormodule} see ${logfile}"
+ rm -f ${dst1}/${datefile}
+ fi
fi
# Sync src2/dst2 if there are changes
if [[ -n "$checkresult2" ]]; then
- rsync_run "${opts[@]}" "${src2}/" "${dst2}/" >> "$logfile" 2>&1
+ logger -t rsync "Updating ${mirrormodule} for ${dst2}"
+ if rsync_run "${opts[@]}" "${src2}/" "${dst2}/" >> "$logfile" 2>&1; then
+ logger -t rsync "Succeed updating ${mirrormodule}"
+ else
+ logger -t rsync "Failed updating ${mirrormodule} see ${logfile}"
+ rm -f ${dst2}/${datefile}
+ fi
fi
-logger -t rsync "Finished updating ${mirrormodule}"
printf "End: %(%c)T\n" -1 >> "$logfile" 2>&1
rm -f "$lockfile"
diff --git a/mkallrepo b/mkallrepo
index 830b2b9..6710acf 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -7,10 +7,11 @@ TMPSIG2018=$(mktemp -t XXXXXXXX.2018)
TMPSIG2021=$(mktemp -t XXXXXXXX.2021)
TMPSIG2023=$(mktemp -t XXXXXXXX.2023)
TMPSIG2024=$(mktemp -t XXXXXXXX.2024)
+TMPSIG2025=$(mktemp -t XXXXXXXX.2025)
cd /home/rpmbuild/site/rpms
-for dep in fedora/{39,40,41}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64}
+for dep in fedora/{40,41,42}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64}
do
[[ $dep =~ /modular ]] && continue
[[ $dep =~ /debug-modular ]] && continue
@@ -51,11 +52,20 @@ if [ -s $TMPSIG ]; then
# 2023
grep fc39 $TMPSIG > $TMPSIG2023
# 2024
- grep src.rpm $TMPSIG > $TMPSIG2024
- grep fc40 $TMPSIG >> $TMPSIG2024
+ grep fc40 $TMPSIG > $TMPSIG2024
grep fc41 $TMPSIG >> $TMPSIG2024
grep el10 $TMPSIG >> $TMPSIG2024
+ # 2025
+ grep src.rpm $TMPSIG > $TMPSIG2025
+ grep fc42 $TMPSIG >> $TMPSIG2025
+ if [ -s $TMPSIG2025 ]; then
+ echo "== Signature des $(cat $TMPSIG2025 | wc -l) nouveaux RPM (2025) =="
+ if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 83833E4687A4AA03B6AC94F2061566968F1F4B2D" --addsign $(cat $TMPSIG2025)
+ then echo done.
+ else exit 1
+ fi
+ fi
if [ -s $TMPSIG2024 ]; then
echo "== Signature des $(cat $TMPSIG2024 | wc -l) nouveaux RPM (2024) =="
if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4" --addsign $(cat $TMPSIG2024)
@@ -109,7 +119,7 @@ then echo "== Création des liens (noarch) =="
else echo "Rien à lier."
fi
-for dep in SRPMS fedora/{39,40,41}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64}
+for dep in SRPMS fedora/{40,41,42}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64}
do
[[ $dep =~ /modular ]] && continue
[[ $dep =~ /debug-modular ]] && continue
diff --git a/mkgit b/mkgit
index 69d3dbe..fa7ee6d 100755
--- a/mkgit
+++ b/mkgit
@@ -6,6 +6,18 @@ if [ -z "$1" ]; then
exit 1
fi
+case $1 in
+ rpms/*)
+ ;;
+ tools/*)
+ ;;
+ web/*)
+ ;;
+ *)
+ echo "Prefix not allowed (rpms/tools/web)"
+ exit 1
+esac
+
GIT=${1%/}
LOC=$(basename $GIT)
diff --git a/mkmodular b/mkmodular
index ee088c6..07ff6da 100755
--- a/mkmodular
+++ b/mkmodular
@@ -346,7 +346,9 @@ chdir($dest);
[$dis,$ver]=explode("/", $dest);
$GPG_PATH="/home/remi/.gnupgrpm";
if ($dis == "fedora") {
- if ($ver >= 40) {
+ if ($ver >= 42) {
+ $GPG_NAME="83833E4687A4AA03B6AC94F2061566968F1F4B2D";
+ } else if ($ver >= 40) {
$GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4";
} else if ($ver >= 38) {
$GPG_NAME="50A5E157DFE548EC7C05E9D8D5933DAB6DEFD35E";
@@ -389,6 +391,7 @@ exec("gpg --armor --detach-sign --default-key \"$GPG_NAME\" --homedir \"$GPG_PAT
chdir($old);
}
+/*
if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array('f39x', $_SERVER['argv'])) {
$dest = 'fedora/39/modular/x86_64';
echo "Populate $dest\n";
@@ -532,7 +535,7 @@ if (in_array('f39', $_SERVER['argv']) || in_array('f39a', $_SERVER['argv']) || i
$mod .= genModule('fedora/39/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
createRepo($dest, $mod);
}
-
+*/
if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array('f40x', $_SERVER['argv'])) {
$dest = 'fedora/40/modular/x86_64';
echo "Populate $dest\n";
@@ -677,6 +680,7 @@ if (in_array('f40', $_SERVER['argv']) || in_array('f40a', $_SERVER['argv']) || i
createRepo($dest, $mod);
}
+// -------------- Fedora 41 -----------------------------------
if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv'])) {
$dest = 'fedora/41/modular/x86_64';
echo "Populate $dest\n";
@@ -797,6 +801,128 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || i
createRepo($dest, $mod);
}
+// -------------- Fedora 42 -----------------------------------
+if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv'])) {
+ $dest = 'fedora/42/modular/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+ $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']);
+ createRepo($dest, $mod);
+
+ $dest = 'fedora/42/debug-modular/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+ $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);
+ createRepo($dest, $mod);
+}
+if (in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+ $dest = 'fedora/42/modular-test/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+ createRepo($dest, $mod);
+
+ $dest = 'fedora/42/debug-modular-test/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+ createRepo($dest, $mod);
+}
+
+if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv'])) {
+ $dest = 'fedora/42/modular/aarch64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
+ $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']);
+ createRepo($dest, $mod);
+
+ $dest = 'fedora/42/debug-modular/aarch64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/debug-php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+ $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);
+ createRepo($dest, $mod);
+}
+if (in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+ $dest = 'fedora/42/modular-test/aarch64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+ createRepo($dest, $mod);
+
+ $dest = 'fedora/42/debug-modular-test/aarch64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'f42'];
+ $mod .= genModule('fedora/42/debug-test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+ $mod .= genModule('fedora/42/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+ createRepo($dest, $mod);
+}
+
+
if (in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$dest = 'enterprise/8/modular-test/x86_64';
echo "Populate $dest\n";
diff --git a/mkrepo b/mkrepo
index 0dfecfa..e658031 100755
--- a/mkrepo
+++ b/mkrepo
@@ -12,7 +12,7 @@ then
elif [ "$nom" = "SRPMS" ]
then
dis=fedora
- ver=40
+ ver=42
old=8
dst=/data/rpms/SRPMS.remi
else
@@ -26,7 +26,10 @@ fi
GPG_PATH=/home/remi/.gnupgrpm
if [ "$dis" == "fedora" ]; then
# Fedora
- if [ "$ver" -ge 40 ]
+ if [ "$ver" -ge 42 ]
+ then echo "key 2025"
+ GPG_NAME="83833E4687A4AA03B6AC94F2061566968F1F4B2D"
+ elif [ "$ver" -ge 40 ]
then echo "key 2024"
GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4"
elif [ "$ver" -ge 38 ]
@@ -50,7 +53,7 @@ if [ "$dis" == "fedora" ]; then
else
# Enterprise
if [ "$ver" -ge 10 ]
- then echo "key 2021"
+ then echo "key 2024"
GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4"
elif [ "$ver" -ge 9 ]
then echo "key 2021"
diff --git a/mockit b/mockit
index c4d9745..0af54ca 100755
--- a/mockit
+++ b/mockit
@@ -5,14 +5,17 @@ if [ "$2" = "" ]; then
echo -e "\t--redis store build command in redis queue"
echo -e "\t--valkey store build command in valkey queue"
echo -e "\t--list list queue content"
- echo -e "\t--nobase | --scl only build SCL packages"
- echo -e "\t--noscl | --base only build base packages\n"
+ echo -e "\t--nobase | --scl only build PHP SCL packages"
+ echo -e "\t--noscl | --base only build PHP base packages"
+ echo -e "\t--mock distro is a mock config name\n"
+ echo -e "Special distro: all, zts, memcached, im6, im7\n"
exit 0
fi
# Script options
BUILD_BASE=1
BUILD_SCLS=1
+BUILD_MOCK=0
REDIS=0
REMOTE=0
@@ -36,16 +39,17 @@ fi
# Queue commands
if [ "$1" == "--list" ]; then
+ a=$($REDISCLI bgsave)
echo "-- x86_64 queue: $($REDISCLI scard mockx) tasks --"
a=$($REDISCLI smembers mockx)
[ -n "$a" ] && $REDISCLI smembers mockx | \
- sed -e 's/^.*-r/ /;s/rebuild/\t/' | sort || \
+ sed -e 's/^.*-r / /;s/rebuild/\t/;s:/.*/::' | sort | head -n 25 || \
ps -ef | grep mock/mock | grep -v grep
echo -e "\n-- aarch64 queue: $($REDISCLI scard mocka) tasks --"
a=$($REDISCLI smembers mocka)
[ -n "$a" ] && $REDISCLI smembers mocka | \
- sed -e 's/^.*-r/ /;s/rebuild/\t/'| sort || \
+ sed -e 's/^.*-r / /;s/rebuild/\t/;s:/.*/::'| sort || \
ps -ef | ssh remi@ampere 'ps -ef | grep mock/mock | grep -v grep'
exit 0
@@ -61,6 +65,11 @@ if [ "$1" == "--nobase" -o "$1" == "--scl" ]; then
elif [ "$1" == "--noscl" -o "$1" == "--base" ]; then
BUILD_SCLS=0
shift
+elif [ "$1" == "--mock" ]; then
+ BUILD_BASE=0
+ BUILD_SCLS=0
+ BUILD_MOCK=1
+ shift
fi
SRPM=$1
@@ -82,13 +91,13 @@ else
fi
case $DIST in
- *x)
+ *x|*xm|*xr|*xr62|*xr72)
if [ $SUF != x ]; then
echo "Not an x86_64 builder"
exit 1
fi
;;
- *a)
+ *a|*am|*ar|*ar62|*ar72)
if [ $SUF != a ]; then
if [ $REDIS -ge 1 ]; then
REMOTE=1
@@ -98,18 +107,14 @@ case $DIST in
fi
fi
;;
- *)
- DIST=$DIST$SUF
- ;;
esac
# SRPM abolute path
+mockref=/home/rpmbuild/SPECS/remirepo/tools/mock
+mocketc=$mockref
+srpmdir=/home/rpmbuild/site/rpms/SRPMS
case $DIST in
- *x)
- mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
- srpmdir=/home/rpmbuild/site/rpms/SRPMS
- ;;
- *a)
+ *a|*am)
mocketc=/home/remi/mock
srpmdir=/home/remi/SRPMS
;;
@@ -140,8 +145,8 @@ fi
# PHP version matrix
echo mockit $SRPM $DIST $MIN $MAX $@
case $DIST in
- fc39x|fc39a|fc40x|fc40a|fc41x|fc41a|el9x|el9a|el10x|el10a)
- LST="82 81 74 80 83 84"
+ fc42x|fc42a|fc40x|fc40a|fc41x|fc41a|el9x|el9a|el10x|el10a)
+ LST="74 80 81 82 83 84"
SCL="74 80 81 82 83 84"
;;
el8a)
@@ -152,9 +157,9 @@ case $DIST in
LST="72 73 74 80 81 82 83 84"
SCL="56 70 71 72 73 74 80 81 82 83 84"
;;
- allx)
+ all)
if [ $REDIS -ge 1 ]; then
- for i in fc39x fc40x fc41x el8x el9x el10x fc39a fc40a fc41a el8a el9a el10a
+ for i in fc40x fc41x fc42x el8x el9x el10x fc40a fc41a fc42a el8a el9a el10a
do
[ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@
[ $BUILD_SCLS -ge 1 ] && $0 --valkey --scl $SRPM $i $MIN $MAX $@
@@ -163,10 +168,10 @@ case $DIST in
echo Not supported for direct build
fi
;;
- ztsx)
+ zts)
if [ $REDIS -ge 1 ]; then
[ $MAX -gt 83 ] && MAX=83
- for i in fc39x fc40x el8x el9x
+ for i in fc40x el8x el9x
do
[ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@
done
@@ -174,9 +179,53 @@ case $DIST in
echo Not supported for direct build
fi
;;
+ memcached)
+ if [ $REDIS -ge 1 ]; then
+ for i in fc40xm fc41x fc42x el8x el9xm el10xm fc40am fc41a fc42a el8a el9am el10am
+ do
+ $0 --valkey --mock $SRPM $i $MIN $MAX $@
+ done
+ else
+ echo Not supported for direct build
+ fi
+ ;;
+ im6)
+ if [ $REDIS -ge 1 ]; then
+ for i in fc40x el8xr el9x fc40a el8ar el9a
+ do
+ $0 --valkey --mock $SRPM $i $MIN $MAX $@
+ done
+ else
+ echo Not supported for direct build
+ fi
+ ;;
+ im7)
+ if [ $REDIS -ge 1 ]; then
+ for i in fc40x fc41x fc42x el8xr el9x el10x fc40a fc41a fc42a el8ar el9a el10a
+ do
+ $0 --valkey --mock $SRPM $i $MIN $MAX $@
+ done
+ else
+ echo Not supported for direct build
+ fi
+ ;;
+ r*)
+ if [ $REDIS -ge 1 ]; then
+ for i in fc40x el8x el9x fc40a el8a el9a
+ do
+ $0 --valkey --mock $SRPM ${i}${DIST} $MIN $MAX $@
+ done
+ else
+ echo Not supported for direct build
+ fi
+ ;;
*)
- echo Unkown DIST $DIST
- exit 1
+ if [ $BUILD_MOCK -eq 0 -o ! -f ${mockref}/${DIST}.cfg ]; then
+ [ $BUILD_MOCK -eq 0 ] && echo "BUILD_MOCK=0"
+ [ ! -f ${mocketc}/${DIST}.cfg ] && echo "${mockref}/${DIST}.cfg missing"
+ echo Unkown DIST $DIST
+ exit 1
+ fi
;;
esac
@@ -208,6 +257,11 @@ do
fi
fi
done
+# Build using mock config
+if [ $BUILD_MOCK -ge 1 ]; then
+ CMD="mock -q --configdir=$mocketc -r ${DIST} rebuild $SRPM $@"
+ $REDISCLI sadd $QUEUE "$CMD"
+fi
if [ $REDIS -ge 1 ]; then
echo "Queue size: " $($REDISCLI scard $QUEUE)
diff --git a/pkgup b/pkgup
index 4ae31ce..a3b8189 100755
--- a/pkgup
+++ b/pkgup
@@ -24,7 +24,7 @@ sed --regexp-extended \
--expression "/^Version:/s/[0-9.]+$/$1/" \
--expression "/github_version/s/[0-9.]+$/$1/" \
--expression "/upstream_version/s/[0-9.]+$/$1/" \
- --expression "/(github|gh)_commit/s/[0-9a-f]{40}$/$2/" \
+ --expression "/(github_|gh_| )commit /s/[0-9a-f]{40}$/$2/" \
--expression "/(github|gh)_date/s/[0-9\-]{10}$/$date/" \
--expression '/^Release:/s/[0-9.]+/1/' \
--expression "s/%changelog/%changelog\n* $rpmdate $vendor - $1-1\n- update to $1\n/" \
generated by cgit (git 2.34.1) at 2025-07-02 00:55:56 +0000