diff options
| -rw-r--r-- | buildfct | 153 | ||||
| -rwxr-xr-x | cleanoldrpm | 2 | ||||
| -rwxr-xr-x | getmock | 122 | ||||
| -rw-r--r-- | mirrorsync | 12 | ||||
| -rwxr-xr-x | mkallrepo | 5 | ||||
| -rwxr-xr-x | mkgit | 12 | ||||
| -rwxr-xr-x | mkmodular | 185 | ||||
| -rwxr-xr-x | mockit | 122 |
8 files changed, 493 insertions, 120 deletions
@@ -41,6 +41,7 @@ alias mockfc40xr60=" mock --configdir=$mocketc -r fc40xr60 alias mockfc40xr62=" mock --configdir=$mocketc -r fc40xr62 rebuild " alias mockfc40xr70=" mock --configdir=$mocketc -r fc40xr70 rebuild " alias mockfc40xr72=" mock --configdir=$mocketc -r fc40xr72 rebuild " +alias mockfc40xr80=" mock --configdir=$mocketc -r fc40xr80 rebuild " alias mockfc40xm=" mock --configdir=$mocketc -r fc40xm rebuild " alias mockfc41x=" mock --configdir=$mocketc -r fc41x rebuild " @@ -56,6 +57,24 @@ 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 mockfc41xr80=" mock --configdir=$mocketc -r fc41xr80 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 mockfc42xr80=" mock --configdir=$mocketc -r fc42xr80 rebuild " alias mockel8x=" mock --configdir=$mocketc -r el8x rebuild " alias mockel8xr=" mock --configdir=$mocketc -r el8xr rebuild " @@ -81,10 +100,12 @@ 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 " alias mockel8xr72=" mock --configdir=$mocketc -r el8xr72 rebuild " +alias mockel8xr80=" mock --configdir=$mocketc -r el8xr80 rebuild " ## alias mockel8xm=" mock --configdir=$mocketc -r el8xm rebuild " alias mockel9x=" mock --configdir=$mocketc -r el9x rebuild " @@ -104,10 +125,12 @@ 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 " alias mockel9xr72=" mock --configdir=$mocketc -r el9xr72 rebuild " +alias mockel9xr80=" mock --configdir=$mocketc -r el9xr80 rebuild " alias mockel9xm=" mock --configdir=$mocketc -r el9xm rebuild " alias mockel10x=" mock --configdir=$mocketc -r el10x rebuild " @@ -126,6 +149,9 @@ 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 mockel10xr72=" mock --configdir=$mocketc -r el10xr72 rebuild " +alias mockel10xr80=" mock --configdir=$mocketc -r el10xr80 rebuild " alias mockel10xm=" mock --configdir=$mocketc -r el10xm rebuild " alias mockepel872=" mock --configdir=$mocketc -r epel872 rebuild " @@ -168,13 +194,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 +230,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 +254,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 +363,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 +380,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 +415,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 +441,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 +467,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 +493,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 +519,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 +539,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 +559,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 +579,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 +599,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 +625,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 +662,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 +672,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 +698,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 +724,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 +750,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 +776,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]; @@ -17,6 +17,9 @@ esac rep=${2-remi} case $dep in +scl85el*) dep=${dep#scl85el} + type=enterprise + ;; scl84el*) dep=${dep#scl84el} type=enterprise ;; @@ -256,6 +259,9 @@ el*) dep=${dep#el} fc*) dep=${dep#fc} type=fedora ;; +scl85fc*) dep=${dep#scl85fc} + type=fedora + ;; scl84fc*) dep=${dep#scl84fc} type=fedora ;; @@ -285,7 +291,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 +303,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 +345,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 +519,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 +535,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 +551,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 +567,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 +583,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 +599,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 +614,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 +623,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 +632,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,14 +641,29 @@ 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*' 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 + getOneMock fc40x $opt '*8.0*' + getOneMock fc40a $opt '*8.0*' + getOneMock fc41x $opt '*8.0*' + getOneMock fc41a $opt '*8.0*' + getOneMock fc42x $opt '*8.0*' + getOneMock fc42a $opt '*8.0*' + getOneMock el8x $opt '*8.0*' + getOneMock el8a $opt '*8.0*' + getOneMock el9x $opt '*8.0*' + getOneMock el9a $opt '*8.0*' + getOneMock el10x $opt '*8.0*' + getOneMock el10a $opt '*8.0*' elif [ $1 = allm ]; then opt=remi @@ -649,9 +671,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 +682,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 @@ -697,43 +719,50 @@ elif [ $1 = scl71 ]; then getOneMock scl71el${i}x $opt done +elif [ $1 = scl85 ]; then + for dis in fc41 fc42 el8 el9 el10 + do + getOneMock scl85${dis}x $opt + getOneMock scl85${dis}a $opt + 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 @@ -756,7 +785,7 @@ elif [ $1 = scl72 ]; then elif [ $1 = allphp ]; then LOG=$(mktemp out.XXXXXXXXXX) MOD="all72 all73 all74 all80 all81 all82 all83 all84" - SCL="scl56 scl70 scl71 scl72 scl73 scl74 scl80 scl81 scl82 scl83 scl84" + SCL="scl56 scl70 scl71 scl72 scl73 scl74 scl80 scl81 scl82 scl83 scl84 scl85" for i in $SCL $MOD do $0 $opt $i | tee $LOG if grep -q '64\.rpm' $LOG && grep -q 'pas un dossier mock' $LOG @@ -765,6 +794,19 @@ elif [ $1 = allphp ]; then 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 @@ -49,6 +49,8 @@ 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" # 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 @@ -76,6 +78,14 @@ rsync_run(){ 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 ${dst}/${mirrormodule}/index.html >> "$logfile" 2>&1 @@ -129,7 +139,7 @@ if [[ -n "$checkresult2" ]]; then logger -t rsync "Succeed updating ${mirrormodule}" else logger -t rsync "Failed updating ${mirrormodule} see ${logfile}" - rm -f ${dst1}/${datefile} + rm -f ${dst2}/${datefile} fi fi @@ -11,7 +11,7 @@ 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 @@ -57,6 +57,7 @@ if [ -s $TMPSIG ]; then 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) ==" @@ -118,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 @@ -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) @@ -391,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"; @@ -534,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"; @@ -553,7 +554,10 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array $mod .= genModule('fedora/40/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/40/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/40/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/40/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0']); + $mod .= genModule('fedora/40/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); createRepo($dest, $mod); @@ -574,6 +578,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array $mod .= genModule('fedora/40/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/40/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/40/debug-redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/40/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/40/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); createRepo($dest, $mod); } @@ -625,7 +630,10 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array $mod .= genModule('fedora/40/redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/40/redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/40/redis72/aarch64',$dest, '*.rpm', '7.2', 'aarch64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']); + + $mod .= genModule('fedora/40/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0']); + $mod .= genModule('fedora/40/memcached/aarch64',$dest, '*.rpm', false, 'aarch64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); createRepo($dest, $mod); @@ -646,6 +654,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array $mod .= genModule('fedora/40/debug-redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/40/debug-redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/40/debug-redis72/aarch64',$dest, '*.rpm', '7.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/40/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/40/debug-memcached/aarch64',$dest, '*.rpm', false, 'aarch64', $deps, $template_memcached); createRepo($dest, $mod); } @@ -679,6 +688,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"; @@ -693,6 +703,9 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/41/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('fedora/41/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0']); createRepo($dest, $mod); $dest = 'fedora/41/debug-modular/x86_64'; @@ -707,6 +720,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $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); createRepo($dest, $mod); } if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -753,6 +767,9 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $mod .= genModule('fedora/41/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('fedora/41/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0']); createRepo($dest, $mod); $dest = 'fedora/41/debug-modular/aarch64'; @@ -767,6 +784,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $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); createRepo($dest, $mod); } if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -799,6 +817,136 @@ 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']); + + $mod .= genModule('fedora/42/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0']); + 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); + $mod .= genModule('fedora/42/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); + 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']); + + $mod .= genModule('fedora/42/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0']); + 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); + $mod .= genModule('fedora/42/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); + 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"; @@ -860,7 +1008,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $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 .= 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']); + $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']); $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/composer1/x86_64', $dest, '*.rpm', '1', 'x86_64', $deps, $template_comp); @@ -891,6 +1040,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $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); + $mod .= genModule('enterprise/8/debug-redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis); createRepo($dest, $mod); } @@ -954,7 +1104,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/redis62/aarch64', $dest, 'redis*.rpm', '6.2', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/8/redis70/aarch64', $dest, 'redis*.rpm', '7.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/8/redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis); - $mod .= genDefaults('redis', '5', ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']); + $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']); $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/composer1/x86_64', $dest, '*.rpm', '1', 'aarch64', $deps, $template_comp); @@ -984,6 +1135,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/debug-redis62/aarch64', $dest, 'redis*.rpm', '6.2', 'aarch64', $deps, $template_redis); $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); createRepo($dest, $mod); } @@ -1041,7 +1193,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) $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 .= 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/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/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); @@ -1069,6 +1222,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $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-redis80/x86_64', $dest, 'redis*.rpm', '8.0', '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); @@ -1095,7 +1249,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) $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 .= 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/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/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); @@ -1123,6 +1278,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $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-redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); createRepo($dest, $mod); @@ -1171,7 +1327,7 @@ if (in_array('el10', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/10/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/10/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/10/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); - $mod .= genModule('enterprise/100/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/10/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/10/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/10/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); @@ -1210,6 +1366,10 @@ 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-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']); @@ -1236,6 +1396,8 @@ 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); createRepo($dest, $mod); @@ -1257,6 +1419,10 @@ 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-7.2', 'remi-8.0']); + $mod .= genModule('enterprise/10/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); @@ -1278,6 +1444,9 @@ 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); createRepo($dest, $mod); } @@ -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,6 +39,7 @@ 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 | \ @@ -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|*xr80) if [ $SUF != x ]; then echo "Not an x86_64 builder" exit 1 fi ;; - *a) + *a|*am|*ar|*ar62|*ar72|*ar80) 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,21 +145,25 @@ 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" + 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" ;; - 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 +172,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 +183,73 @@ 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 + ;; + r80) + if [ $REDIS -ge 1 ]; then + for i in fc42x fc41x fc40x el8x el9x el10x fc40a fc41a fc42a el8a el9a el10a + do + $0 --valkey --mock $SRPM ${i}${DIST} $MIN $MAX $@ + done + else + echo Not supported for direct build + fi + ;; + 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 + $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 +281,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) |