diff options
| -rw-r--r-- | buildfct | 190 | ||||
| -rwxr-xr-x | cleanoldrpm | 1 | ||||
| -rwxr-xr-x | getmock | 338 | ||||
| -rwxr-xr-x | mkallrepo | 20 | ||||
| -rwxr-xr-x | mkmodular | 696 | ||||
| -rwxr-xr-x | mkrepo | 6 | ||||
| -rwxr-xr-x | mockit | 110 | ||||
| -rwxr-xr-x | mockrun | 15 |
8 files changed, 875 insertions, 501 deletions
@@ -5,44 +5,6 @@ alias rhpkg='echo NO PLEASE, use fedpkg' mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock -alias mockfc39x=" mock --configdir=$mocketc -r fc39x rebuild " -alias mockfc39x74=" mock --configdir=$mocketc -r fc39x74 rebuild " -alias mockfc39x80=" mock --configdir=$mocketc -r fc39x80 rebuild " -alias mockfc39x81=" mock --configdir=$mocketc -r fc39x81 rebuild " -alias mockfc39x82=" mock --configdir=$mocketc -r fc39x82 rebuild " -alias mockfc39x83=" mock --configdir=$mocketc -r fc39x83 rebuild " -alias mockfc39x84=" mock --configdir=$mocketc -r fc39x84 rebuild " -alias mockfc39xscl74=" mock --configdir=$mocketc -r fc39xscl74 rebuild " -alias mockfc39xscl80=" mock --configdir=$mocketc -r fc39xscl80 rebuild " -alias mockfc39xscl81=" mock --configdir=$mocketc -r fc39xscl81 rebuild " -alias mockfc39xscl82=" mock --configdir=$mocketc -r fc39xscl82 rebuild " -alias mockfc39xscl83=" mock --configdir=$mocketc -r fc39xscl83 rebuild " -alias mockfc39xscl84=" mock --configdir=$mocketc -r fc39xscl84 rebuild " -alias mockfc39xr60=" mock --configdir=$mocketc -r fc39xr60 rebuild " -alias mockfc39xr62=" mock --configdir=$mocketc -r fc39xr62 rebuild " -alias mockfc39xr70=" mock --configdir=$mocketc -r fc39xr70 rebuild " -alias mockfc39xr72=" mock --configdir=$mocketc -r fc39xr72 rebuild " -alias mockfc39xm=" mock --configdir=$mocketc -r fc39xm rebuild " - -alias mockfc40x=" mock --configdir=$mocketc -r fc40x rebuild " -alias mockfc40x74=" mock --configdir=$mocketc -r fc40x74 rebuild " -alias mockfc40x80=" mock --configdir=$mocketc -r fc40x80 rebuild " -alias mockfc40x81=" mock --configdir=$mocketc -r fc40x81 rebuild " -alias mockfc40x82=" mock --configdir=$mocketc -r fc40x82 rebuild " -alias mockfc40x83=" mock --configdir=$mocketc -r fc40x83 rebuild " -alias mockfc40x84=" mock --configdir=$mocketc -r fc40x84 rebuild " -alias mockfc40xscl74=" mock --configdir=$mocketc -r fc40xscl74 rebuild " -alias mockfc40xscl80=" mock --configdir=$mocketc -r fc40xscl80 rebuild " -alias mockfc40xscl81=" mock --configdir=$mocketc -r fc40xscl81 rebuild " -alias mockfc40xscl82=" mock --configdir=$mocketc -r fc40xscl82 rebuild " -alias mockfc40xscl83=" mock --configdir=$mocketc -r fc40xscl83 rebuild " -alias mockfc40xscl84=" mock --configdir=$mocketc -r fc40xscl84 rebuild " -alias mockfc40xr60=" mock --configdir=$mocketc -r fc40xr60 rebuild " -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 mockfc40xm=" mock --configdir=$mocketc -r fc40xm rebuild " - alias mockfc41x=" mock --configdir=$mocketc -r fc41x rebuild " alias mockfc41x74=" mock --configdir=$mocketc -r fc41x74 rebuild " alias mockfc41x80=" mock --configdir=$mocketc -r fc41x80 rebuild " @@ -50,12 +12,19 @@ alias mockfc41x81=" mock --configdir=$mocketc -r fc41x81 alias mockfc41x82=" mock --configdir=$mocketc -r fc41x82 rebuild " alias mockfc41x83=" mock --configdir=$mocketc -r fc41x83 rebuild " alias mockfc41x84=" mock --configdir=$mocketc -r fc41x84 rebuild " +alias mockfc41x85=" mock --configdir=$mocketc -r fc41x85 rebuild " alias mockfc41xscl74=" mock --configdir=$mocketc -r fc41xscl74 rebuild " alias mockfc41xscl80=" mock --configdir=$mocketc -r fc41xscl80 rebuild " alias mockfc41xscl81=" mock --configdir=$mocketc -r fc41xscl81 rebuild " 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 mockfc41xr82=" mock --configdir=$mocketc -r fc41xr82 rebuild " +alias mockfc41xr84=" mock --configdir=$mocketc -r fc41xr84 rebuild " +alias mockfc41xv81=" mock --configdir=$mocketc -r fc41xv81 rebuild " +alias mockfc41xv90=" mock --configdir=$mocketc -r fc41xv90 rebuild " alias mockfc42x=" mock --configdir=$mocketc -r fc42x rebuild " alias mockfc42x74=" mock --configdir=$mocketc -r fc42x74 rebuild " @@ -64,12 +33,40 @@ alias mockfc42x81=" mock --configdir=$mocketc -r fc42x81 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 mockfc42x85=" mock --configdir=$mocketc -r fc42x85 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 mockfc42xr82=" mock --configdir=$mocketc -r fc42xr82 rebuild " +alias mockfc42xr84=" mock --configdir=$mocketc -r fc42xr84 rebuild " +alias mockfc42xv81=" mock --configdir=$mocketc -r fc42xv81 rebuild " +alias mockfc42xv90=" mock --configdir=$mocketc -r fc42xv90 rebuild " + +alias mockfc43x=" mock --configdir=$mocketc -r fc43x rebuild " +alias mockfc43x74=" mock --configdir=$mocketc -r fc43x74 rebuild " +alias mockfc43x80=" mock --configdir=$mocketc -r fc43x80 rebuild " +alias mockfc43x81=" mock --configdir=$mocketc -r fc43x81 rebuild " +alias mockfc43x82=" mock --configdir=$mocketc -r fc43x82 rebuild " +alias mockfc43x83=" mock --configdir=$mocketc -r fc43x83 rebuild " +alias mockfc43x84=" mock --configdir=$mocketc -r fc43x84 rebuild " +alias mockfc43x85=" mock --configdir=$mocketc -r fc43x85 rebuild " +alias mockfc43xscl74=" mock --configdir=$mocketc -r fc43xscl74 rebuild " +alias mockfc43xscl80=" mock --configdir=$mocketc -r fc43xscl80 rebuild " +alias mockfc43xscl81=" mock --configdir=$mocketc -r fc43xscl81 rebuild " +alias mockfc43xscl82=" mock --configdir=$mocketc -r fc43xscl82 rebuild " +alias mockfc43xscl83=" mock --configdir=$mocketc -r fc43xscl83 rebuild " +alias mockfc43xscl84=" mock --configdir=$mocketc -r fc43xscl84 rebuild " +alias mockfc43xscl85=" mock --configdir=$mocketc -r fc43xscl85 rebuild " +alias mockfc43xr80=" mock --configdir=$mocketc -r fc43xr80 rebuild " +alias mockfc43xr82=" mock --configdir=$mocketc -r fc43xr82 rebuild " +alias mockfc43xr84=" mock --configdir=$mocketc -r fc43xr84 rebuild " +alias mockfc43xv81=" mock --configdir=$mocketc -r fc43xv81 rebuild " +alias mockfc43xv90=" mock --configdir=$mocketc -r fc43xv90 rebuild " alias mockel8x=" mock --configdir=$mocketc -r el8x rebuild " alias mockel8xr=" mock --configdir=$mocketc -r el8xr rebuild " @@ -84,6 +81,7 @@ alias mockel8x82=" mock --configdir=$mocketc -r el8x82 r alias mockel8n82=" mock --configdir=$mocketc -r el8n82 rebuild " alias mockel8x83=" mock --configdir=$mocketc -r el8x83 rebuild " alias mockel8x84=" mock --configdir=$mocketc -r el8x84 rebuild " +alias mockel8x85=" mock --configdir=$mocketc -r el8x85 rebuild " alias mockel8xscl56=" mock --configdir=$mocketc -r el8xscl56 rebuild " alias mockel8xscl70=" mock --configdir=$mocketc -r el8xscl70 rebuild " alias mockel8xscl71=" mock --configdir=$mocketc -r el8xscl71 rebuild " @@ -95,10 +93,16 @@ 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 mockel8xr82=" mock --configdir=$mocketc -r el8xr82 rebuild " +alias mockel8xr84=" mock --configdir=$mocketc -r el8xr84 rebuild " +alias mockel8xv81=" mock --configdir=$mocketc -r el8xv81 rebuild " +alias mockel8xv90=" mock --configdir=$mocketc -r el8xv90 rebuild " ## alias mockel8xm=" mock --configdir=$mocketc -r el8xm rebuild " alias mockel9x=" mock --configdir=$mocketc -r el9x rebuild " @@ -112,16 +116,23 @@ alias mockel9x82=" mock --configdir=$mocketc -r el9x82 r alias mockel9n82=" mock --configdir=$mocketc -r el9n82 rebuild " alias mockel9x83=" mock --configdir=$mocketc -r el9x83 rebuild " alias mockel9x84=" mock --configdir=$mocketc -r el9x84 rebuild " +alias mockel9x85=" mock --configdir=$mocketc -r el9x85 rebuild " alias mockel9xscl74=" mock --configdir=$mocketc -r el9xscl74 rebuild " alias mockel9xscl80=" mock --configdir=$mocketc -r el9xscl80 rebuild " alias mockel9xscl81=" mock --configdir=$mocketc -r el9xscl81 rebuild " alias mockel9xscl82=" mock --configdir=$mocketc -r el9xscl82 rebuild " alias 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 mockel9xr82=" mock --configdir=$mocketc -r el9xr82 rebuild " +alias mockel9xr84=" mock --configdir=$mocketc -r el9xr84 rebuild " +alias mockel9xv81=" mock --configdir=$mocketc -r el9xv81 rebuild " +alias mockel9xv90=" mock --configdir=$mocketc -r el9xv90 rebuild " alias mockel9xm=" mock --configdir=$mocketc -r el9xm rebuild " alias mockel10x=" mock --configdir=$mocketc -r el10x rebuild " @@ -134,13 +145,22 @@ alias mockel10x82=" mock --configdir=$mocketc -r el10x82 alias mockel10n82=" mock --configdir=$mocketc -r el10n82 rebuild " alias mockel10x83=" mock --configdir=$mocketc -r el10x83 rebuild " alias mockel10x84=" mock --configdir=$mocketc -r el10x84 rebuild " +alias mockel10x85=" mock --configdir=$mocketc -r el10x85 rebuild " alias mockel10xscl74=" mock --configdir=$mocketc -r el10xscl74 rebuild " alias mockel10xscl80=" mock --configdir=$mocketc -r el10xscl80 rebuild " alias mockel10xscl81=" mock --configdir=$mocketc -r el10xscl81 rebuild " 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 mockel10xr82=" mock --configdir=$mocketc -r el10xr82 rebuild " +alias mockel10xr84=" mock --configdir=$mocketc -r el10xr84 rebuild " +alias mockel10xv81=" mock --configdir=$mocketc -r el10xv81 rebuild " +alias mockel10xv90=" mock --configdir=$mocketc -r el10xv90 rebuild " alias mockel10xm=" mock --configdir=$mocketc -r el10xm rebuild " +alias mockel10t84=" mock --configdir=$mocketc -r el10t84 rebuild " alias mockepel872=" mock --configdir=$mocketc -r epel872 rebuild " alias mockepel873=" mock --configdir=$mocketc -r epel873 rebuild " @@ -182,13 +202,13 @@ 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 !")& + (mock $quiet --configdir=$mocketc -r fc43x rebuild "$@" && echo "$(date +%X) (84) fc43 Ok." || echo "fc43 Error !")& pids="$pids $!" echo -n "" - (mock $quiet --configdir=$mocketc -r fc41x rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc41 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 el8n81 rebuild "$@" && echo "$(date +%X) (81) el8 Ok." || echo "el8 Error !")& @@ -218,13 +238,13 @@ 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 !")& + (mock $quiet --configdir=$mocketc -r fc43x rebuild "$@" && echo "$(date +%X) (84) fc43 Ok." || echo "fc43 Error !")& pids="$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 el8n82 rebuild "$@" && echo "$(date +%X) (81) el8 Ok." || echo "el8 Error !")& @@ -254,13 +274,13 @@ 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 !")& + (mock $quiet --configdir=$mocketc -r fc43x rebuild "$@" && echo "$(date +%X) (84) fc43 Ok." || echo "fc43 Error !")& pids="$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 el8n83 rebuild "$@" && echo "$(date +%X) (83) el8 Ok." || echo "el8 Error !")& @@ -351,7 +371,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 40 42 + for i in 41 42 43 do echo -n "$(date +%X) 74 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !" @@ -368,6 +388,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 43 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="" @@ -377,7 +423,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 42 41 40 + for i in 43 42 41 do echo -n "$(date +%X) scl84 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl84 rebuild "$@" && echo " Ok." || echo " Error !" @@ -403,7 +449,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 42 40 + for i in 43 41 42 do echo -n "$(date +%X) scl83 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !" @@ -429,7 +475,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 40 42 + for i in 43 41 42 do echo -n "$(date +%X) scl82 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !" @@ -455,7 +501,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 42 41 40 + for i in 43 42 41 do echo -n "$(date +%X) scl81 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !" @@ -551,6 +597,32 @@ else fi } +# Build All distribution / version / 64bits for remi/remi-php85 +mock85x() +{ +quiet="" +if [ "$1" = "-q" ]; then + quiet="--quiet" + shift +fi + +if [ -f "$1" ]; then + for i in 41 42 43 + do + echo -n "$(date +%X) 84 fc$i " + mock $quiet --configdir=$mocketc -r fc${i}x85 rebuild "$@" && echo " Ok." || echo " Error !" + done + for i in 8 9 10 + do + echo -n "$(date +%X) 84 el$i " + mock $quiet --configdir=$mocketc -r el${i}x85 rebuild "$@"&& echo " Ok." || echo " Error !" + done + date +%X +else + echo "file not found '$1'" +fi +} + # Build All distribution / version / 64bits for remi/remi-php84 mock84x() { @@ -561,7 +633,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 42 40 + for i in 43 41 42 do echo -n "$(date +%X) 84 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x84 rebuild "$@" && echo " Ok." || echo " Error !" @@ -587,7 +659,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 42 41 40 + for i in 42 41 43 do echo -n "$(date +%X) 83 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !" @@ -634,7 +706,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 40 42 + for i in 41 42 43 do echo -n "$(date +%X) 82 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !" @@ -660,7 +732,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 42 40 + for i in 41 42 43 do echo -n "$(date +%X) 81 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !" @@ -686,7 +758,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 42 41 40 + for i in 42 41 43 do echo -n "$(date +%X) 80 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !" @@ -712,7 +784,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 42 40 + for i in 43 41 42 do echo -n "$(date +%X) scl80 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !" @@ -738,7 +810,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 40 42 + for i in 43 41 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 50bd0f9..e4ee205 100755 --- a/cleanoldrpm +++ b/cleanoldrpm @@ -26,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 ;; @@ -190,6 +193,26 @@ el???84) fi type=enterprise ;; +el??85) + dep=${1:2:1} + if [ "$2" == "php85" -o "$2" == "test85" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php85 + else rep=${2}85 + fi + type=enterprise + ;; +el???85) + dep=${1:2:2} + if [ "$2" == "php85" -o "$2" == "test85" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php85 + else rep=${2}85 + fi + type=enterprise + ;; fc???74) dep=${1:2:2} if [ "$2" == "php74" -o "$2" == "test74" ] @@ -250,12 +273,25 @@ fc???84) fi type=fedora ;; +fc???85) + dep=${1:2:2} + if [ "$2" == "php85" -o "$2" == "test85" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php85 + else rep=${2}85 + fi + type=fedora + ;; el*) dep=${dep#el} type=enterprise ;; fc*) dep=${dep#fc} type=fedora ;; +scl85fc*) dep=${dep#scl85fc} + type=fedora + ;; scl84fc*) dep=${dep#scl84fc} type=fedora ;; @@ -285,7 +321,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 +333,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 @@ -346,11 +382,11 @@ do cp $i priv/fc42.x86_64 && echo + $i copied priv FC42 fi ;; - remi-crypto*fc40*) - if [ -f priv/fc40.x86_64/$j ]; then + remi-crypto*fc43*) + if [ -f priv/fc43.x86_64/$j ]; then echo " " $i already there else - cp $i priv/fc40.x86_64 && echo + $i copied priv FC40 + cp $i priv/fc43.x86_64 && echo + $i copied priv FC42 fi ;; *-debuginfo-*aarch64.rpm|*-debugsource-*aarch64.rpm) @@ -513,103 +549,117 @@ elif [ $1 = all73 ]; then elif [ $1 = all74 ]; then [ $opt = remi ] && opt=php74 [ $opt = test ] && opt=test74 - 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*' - getOneMock fc41a74 $opt '*7.4*' - getOneMock el8x74 $opt '*7.4*' - getOneMock el8a74 $opt '*7.4*' - getOneMock el9x74 $opt '*7.4*' - getOneMock el9a74 $opt '*7.4*' - getOneMock el10x74 $opt '*7.4*' - getOneMock el10a74 $opt '*7.4*' + getOneMock fc43x74 $opt '*module_php.7.4*' + getOneMock fc43a74 $opt '*module_php.7.4*' + getOneMock fc42x74 $opt '*module_php.7.4*' + getOneMock fc42a74 $opt '*module_php.7.4*' + getOneMock fc41x74 $opt '*module_php.7.4*' + getOneMock fc41a74 $opt '*module_php.7.4*' + getOneMock el8x74 $opt '*module_php.7.4*' + getOneMock el8a74 $opt '*module_php.7.4*' + getOneMock el9x74 $opt '*module_php.7.4*' + getOneMock el9a74 $opt '*module_php.7.4*' + getOneMock el10x74 $opt '*module_php.7.4*' + getOneMock el10a74 $opt '*module_php.7.4*' elif [ $1 = all80 ]; then [ $opt = remi ] && opt=php80 [ $opt = test ] && opt=test80 - 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*' - getOneMock fc41a80 $opt '*8.0*' - getOneMock el8x80 $opt '*8.0*' - getOneMock el8a80 $opt '*8.0*' - getOneMock el9x80 $opt '*8.0*' - getOneMock el9a80 $opt '*8.0*' - getOneMock el10x80 $opt '*8.0*' - getOneMock el10a80 $opt '*8.0*' + getOneMock fc43x80 $opt '*module_php.8.0*' + getOneMock fc43a80 $opt '*module_php.8.0*' + getOneMock fc42x80 $opt '*module_php.8.0*' + getOneMock fc42a80 $opt '*module_php.8.0*' + getOneMock fc41x80 $opt '*module_php.8.0*' + getOneMock fc41a80 $opt '*module_php.8.0*' + getOneMock el8x80 $opt '*module_php.8.0*' + getOneMock el8a80 $opt '*module_php.8.0*' + getOneMock el9x80 $opt '*module_php.8.0*' + getOneMock el9a80 $opt '*module_php.8.0*' + getOneMock el10x80 $opt '*module_php.8.0*' + getOneMock el10a80 $opt '*module_php.8.0*' elif [ $1 = all81 ]; then [ $opt = remi ] && opt=php81 [ $opt = test ] && opt=test81 - 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*' - getOneMock fc41a81 $opt '*8.1*' - getOneMock el8x81 $opt '*8.1*' - getOneMock el8a81 $opt '*8.1*' - getOneMock el9x81 $opt '*8.1*' - getOneMock el9a81 $opt '*8.1*' - getOneMock el10x81 $opt '*8.1*' - getOneMock el10a81 $opt '*8.1*' + getOneMock fc43x81 $opt '*module_php.8.1*' + getOneMock fc43a81 $opt '*module_php.8.1*' + getOneMock fc42x81 $opt '*module_php.8.1*' + getOneMock fc42a81 $opt '*module_php.8.1*' + getOneMock fc41x81 $opt '*module_php.8.1*' + getOneMock fc41a81 $opt '*module_php.8.1*' + getOneMock el8x81 $opt '*module_php.8.1*' + getOneMock el8a81 $opt '*module_php.8.1*' + getOneMock el9x81 $opt '*module_php.8.1*' + getOneMock el9a81 $opt '*module_php.8.1*' + getOneMock el10x81 $opt '*module_php.8.1*' + getOneMock el10a81 $opt '*module_php.8.1*' elif [ $1 = all82 ]; then [ $opt = remi ] && opt=php82 [ $opt = test ] && opt=test82 - 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*' - getOneMock fc41a82 $opt '*8.2*' - getOneMock el8x82 $opt '*8.2*' - getOneMock el8a82 $opt '*8.2*' - getOneMock el9x82 $opt '*8.2*' - getOneMock el9a82 $opt '*8.2*' - getOneMock el10x82 $opt '*8.2*' - getOneMock el10a82 $opt '*8.2*' + getOneMock fc43x82 $opt '*module_php.8.2*' + getOneMock fc43a82 $opt '*module_php.8.2*' + getOneMock fc42x82 $opt '*module_php.8.2*' + getOneMock fc42a82 $opt '*module_php.8.2*' + getOneMock fc41x82 $opt '*module_php.8.2*' + getOneMock fc41a82 $opt '*module_php.8.2*' + getOneMock el8x82 $opt '*module_php.8.2*' + getOneMock el8a82 $opt '*module_php.8.2*' + getOneMock el9x82 $opt '*module_php.8.2*' + getOneMock el9a82 $opt '*module_php.8.2*' + getOneMock el10x82 $opt '*module_php.8.2*' + getOneMock el10a82 $opt '*module_php.8.2*' elif [ $1 = all83 ]; then [ $opt = remi ] && opt=php83 [ $opt = test ] && opt=test83 - 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*' - getOneMock fc41a83 $opt '*8.3*' - getOneMock el8x83 $opt '*8.3*' - getOneMock el8a83 $opt '*8.3*' - getOneMock el9x83 $opt '*8.3*' - getOneMock el9a83 $opt '*8.3*' - getOneMock el10x83 $opt '*8.3*' - getOneMock el10a83 $opt '*8.3*' + getOneMock fc43x83 $opt '*module_php.8.3*' + getOneMock fc43a83 $opt '*module_php.8.3*' + getOneMock fc42x83 $opt '*module_php.8.3*' + getOneMock fc42a83 $opt '*module_php.8.3*' + getOneMock fc41x83 $opt '*module_php.8.3*' + getOneMock fc41a83 $opt '*module_php.8.3*' + getOneMock el8x83 $opt '*module_php.8.3*' + getOneMock el8a83 $opt '*module_php.8.3*' + getOneMock el9x83 $opt '*module_php.8.3*' + getOneMock el9a83 $opt '*module_php.8.3*' + getOneMock el10x83 $opt '*module_php.8.3*' + getOneMock el10a83 $opt '*module_php.8.3*' elif [ $1 = all84 ]; then [ $opt = remi ] && opt=php84 [ $opt = test ] && opt=test84 - 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*' - getOneMock fc41a84 $opt '*8.4*' - getOneMock el8x84 $opt '*8.4*' - getOneMock el8a84 $opt '*8.4*' - getOneMock el9x84 $opt '*8.4*' - getOneMock el9a84 $opt '*8.4*' - getOneMock el10x84 $opt '*8.4*' - getOneMock el10a84 $opt '*8.4*' + getOneMock fc43x84 $opt '*module_php.8.4*' + getOneMock fc43a84 $opt '*module_php.8.4*' + getOneMock fc42x84 $opt '*module_php.8.4*' + getOneMock fc42a84 $opt '*module_php.8.4*' + getOneMock fc41x84 $opt '*module_php.8.4*' + getOneMock fc41a84 $opt '*module_php.8.4*' + getOneMock el8x84 $opt '*module_php.8.4*' + getOneMock el8a84 $opt '*module_php.8.4*' + getOneMock el9x84 $opt '*module_php.8.4*' + getOneMock el9a84 $opt '*module_php.8.4*' + getOneMock el10x84 $opt '*module_php.8.4*' + getOneMock el10a84 $opt '*module_php.8.4*' + +elif [ $1 = all85 ]; then + [ $opt = remi ] && opt=php85 + [ $opt = test ] && opt=test85 + getOneMock fc43x85 $opt '*module_php.8.5*' + getOneMock fc43a85 $opt '*module_php.8.5*' + getOneMock fc42x85 $opt '*module_php.8.5*' + getOneMock fc42a85 $opt '*module_php.8.5*' + getOneMock fc41x85 $opt '*module_php.8.5*' + getOneMock fc41a85 $opt '*module_php.8.5*' + getOneMock el8x85 $opt '*module_php.8.5*' + getOneMock el8a85 $opt '*module_php.8.5*' + getOneMock el9x85 $opt '*module_php.8.5*' + getOneMock el9a85 $opt '*module_php.8.5*' + getOneMock el10x85 $opt '*module_php.8.5*' + getOneMock el10a85 $opt '*module_php.8.5*' elif [ $1 = allr60 ]; then opt=redis60 - getOneMock fc40x $opt '*6.0*' - getOneMock fc40a $opt '*6.0*' getOneMock el8x $opt '*6.0*' getOneMock el8a $opt '*6.0*' getOneMock el9x $opt '*6.0*' @@ -617,17 +667,13 @@ elif [ $1 = allr60 ]; then elif [ $1 = allr62 ]; then opt=redis62 - getOneMock fc40x $opt '*6.2*' - getOneMock fc40a $opt '*6.2*' - getOneMock el8x $opt '*6.2*' - getOneMock el8a $opt '*6.2*' - getOneMock el9x $opt '*6.2*' - getOneMock el9a $opt '*6.2*' + getOneMock el8x $opt '*module_redis.6.2*' + getOneMock el8a $opt '*module_redis.6.2*' + getOneMock el9x $opt '*module_redis.6.2*' + getOneMock el9a $opt '*module_redis.6.2*' elif [ $1 = allr70 ]; then opt=redis70 - getOneMock fc40x $opt '*7.0*' - getOneMock fc40a $opt '*7.0*' getOneMock el8x $opt '*7.0*' getOneMock el8a $opt '*7.0*' getOneMock el9x $opt '*7.0*' @@ -635,12 +681,87 @@ elif [ $1 = allr70 ]; then elif [ $1 = allr72 ]; then opt=redis72 - 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 el8x $opt '*module_redis.7.2*' + getOneMock el8a $opt '*module_redis.7.2*' + getOneMock el9x $opt '*module_redis.7.2*' + getOneMock el9a $opt '*module_redis.7.2*' + getOneMock el10x $opt '*module_redis.7.2*' + getOneMock el10a $opt '*module_redis.7.2*' + +elif [ $1 = allv90 ]; then + opt=valkey90 + getOneMock fc41x $opt '*module_valkey.9.0*' + getOneMock fc41a $opt '*module_valkey.9.0*' + getOneMock fc42x $opt '*module_valkey.9.0*' + getOneMock fc42a $opt '*module_valkey.9.0*' + getOneMock fc43x $opt '*module_valkey.9.0*' + getOneMock fc43a $opt '*module_valkey.9.0*' + getOneMock el8x $opt '*module_valkey.9.0*' + getOneMock el8a $opt '*module_valkey.9.0*' + getOneMock el9x $opt '*module_valkey.9.0*' + getOneMock el9a $opt '*module_valkey.9.0*' + getOneMock el10x $opt '*module_valkey.9.0*' + getOneMock el10a $opt '*module_valkey.9.0*' + +elif [ $1 = allv81 ]; then + opt=valkey81 + getOneMock fc41x $opt '*module_valkey.8.1*' + getOneMock fc41a $opt '*module_valkey.8.1*' + getOneMock fc42x $opt '*module_valkey.8.1*' + getOneMock fc42a $opt '*module_valkey.8.1*' + getOneMock fc43x $opt '*module_valkey.8.1*' + getOneMock fc43a $opt '*module_valkey.8.1*' + getOneMock el8x $opt '*module_valkey.8.1*' + getOneMock el8a $opt '*module_valkey.8.1*' + getOneMock el9x $opt '*module_valkey.8.1*' + getOneMock el9a $opt '*module_valkey.8.1*' + getOneMock el10x $opt '*module_valkey.8.1*' + getOneMock el10a $opt '*module_valkey.8.1*' + +elif [ $1 = allr84 ]; then + opt=redis84 + getOneMock fc41x $opt '*module_redis.8.4*' + getOneMock fc41a $opt '*module_redis.8.4*' + getOneMock fc42x $opt '*module_redis.8.4*' + getOneMock fc42a $opt '*module_redis.8.4*' + getOneMock fc43x $opt '*module_redis.8.4*' + getOneMock fc43a $opt '*module_redis.8.4*' + getOneMock el8x $opt '*module_redis.8.4*' + getOneMock el8a $opt '*module_redis.8.4*' + getOneMock el9x $opt '*module_redis.8.4*' + getOneMock el9a $opt '*module_redis.8.4*' + getOneMock el10x $opt '*module_redis.8.4*' + getOneMock el10a $opt '*module_redis.8.4*' + +elif [ $1 = allr82 ]; then + opt=redis82 + getOneMock fc41x $opt '*module_redis.8.2*' + getOneMock fc41a $opt '*module_redis.8.2*' + getOneMock fc42x $opt '*module_redis.8.2*' + getOneMock fc42a $opt '*module_redis.8.2*' + getOneMock fc43x $opt '*module_redis.8.2*' + getOneMock fc43a $opt '*module_redis.8.2*' + getOneMock el8x $opt '*module_redis.8.2*' + getOneMock el8a $opt '*module_redis.8.2*' + getOneMock el9x $opt '*module_redis.8.2*' + getOneMock el9a $opt '*module_redis.8.2*' + getOneMock el10x $opt '*module_redis.8.2*' + getOneMock el10a $opt '*module_redis.8.2*' + +elif [ $1 = allr80 ]; then + opt=redis80 + getOneMock fc41x $opt '*module_redis.8.0*' + getOneMock fc41a $opt '*module_redis.8.0*' + getOneMock fc42x $opt '*module_redis.8.0*' + getOneMock fc42a $opt '*module_redis.8.0*' + getOneMock fc43x $opt '*module_redis.8.0*' + getOneMock fc43a $opt '*module_redis.8.0*' + getOneMock el8x $opt '*module_redis.8.0*' + getOneMock el8a $opt '*module_redis.8.0*' + getOneMock el9x $opt '*module_redis.8.0*' + getOneMock el9a $opt '*module_redis.8.0*' + getOneMock el10x $opt '*module_redis.8.0*' + getOneMock el10a $opt '*module_redis.8.0*' elif [ $1 = allm ]; then opt=remi @@ -651,8 +772,6 @@ elif [ $1 = allm ]; then getOneMock fc42x $opt '*1.6*' getOneMock fc42a $opt '*1.6*' opt=memcached - getOneMock fc40x $opt '*1.6*' - getOneMock fc40a $opt '*1.6*' getOneMock el9x $opt '*1.6*' getOneMock el9a $opt '*1.6*' getOneMock el10x $opt '*1.6*' @@ -663,7 +782,7 @@ elif [ $1 = allx ]; then do (getOneMock el${i}x $opt) done - for i in 40 41 42 + for i in 41 42 43 do (getOneMock fc${i}x $opt) done @@ -673,7 +792,7 @@ elif [ $1 = alla ]; then do (getOneMock el${i}a $opt) done - for i in 40 41 42 + for i in 41 42 43 do (getOneMock fc${i}a $opt) done @@ -696,43 +815,50 @@ elif [ $1 = scl71 ]; then getOneMock scl71el${i}x $opt done +elif [ $1 = scl85 ]; then + for dis in fc43 fc41 fc42 el8 el9 el10 + do + getOneMock scl85${dis}x $opt + getOneMock scl85${dis}a $opt + done + elif [ $1 = scl84 ]; then - for dis in fc40 fc41 fc42 el8 el9 el10 + for dis in fc43 fc41 fc42 el8 el9 el10 do getOneMock scl84${dis}x $opt getOneMock scl84${dis}a $opt done elif [ $1 = scl83 ]; then - for dis in fc40 fc41 fc42 el8 el9 el10 + for dis in fc43 fc41 fc42 el8 el9 el10 do getOneMock scl83${dis}x $opt getOneMock scl83${dis}a $opt done elif [ $1 = scl82 ]; then - for dis in fc40 fc41 fc42 el8 el9 el10 + for dis in fc43 fc41 fc42 el8 el9 el10 do getOneMock scl82${dis}x $opt getOneMock scl82${dis}a $opt done elif [ $1 = scl81 ]; then - for dis in fc40 fc41 fc42 el8 el9 el10 + for dis in fc43 fc41 fc42 el8 el9 el10 do getOneMock scl81${dis}x $opt getOneMock scl81${dis}a $opt done elif [ $1 = scl80 ]; then - for dis in fc42 fc40 fc41 el8 el9 el10 + for dis in fc43 fc42 fc41 el8 el9 el10 do getOneMock scl80${dis}x $opt getOneMock scl80${dis}a $opt done elif [ $1 = scl74 ]; then - for dis in fc42 fc40 fc41 el8 el9 el10 + for dis in fc43 fc42 fc41 el8 el9 el10 do getOneMock scl74${dis}x $opt getOneMock scl74${dis}a $opt @@ -754,8 +880,8 @@ 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" + MOD="all72 all73 all74 all80 all81 all82 all83 all84 all85" + 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 @@ -11,7 +11,7 @@ TMPSIG2025=$(mktemp -t XXXXXXXX.2025) cd /home/rpmbuild/site/rpms -for dep in fedora/{40,41,42}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} +for dep in fedora/{41,42,43}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} do [[ $dep =~ /modular ]] && continue [[ $dep =~ /debug-modular ]] && continue @@ -52,51 +52,51 @@ if [ -s $TMPSIG ]; then # 2023 grep fc39 $TMPSIG > $TMPSIG2023 # 2024 - grep fc40 $TMPSIG > $TMPSIG2024 - grep fc41 $TMPSIG >> $TMPSIG2024 + grep fc41 $TMPSIG > $TMPSIG2024 grep el10 $TMPSIG >> $TMPSIG2024 # 2025 grep src.rpm $TMPSIG > $TMPSIG2025 grep fc42 $TMPSIG >> $TMPSIG2025 + grep fc43 $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) + if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 83833E4687A4AA03B6AC94F2061566968F1F4B2D" --resign $(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) + if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4" --resign $(cat $TMPSIG2024) then echo done. else exit 1 fi fi if [ -s $TMPSIG2023 ]; then echo "== Signature des $(cat $TMPSIG2023 | wc -l) nouveaux RPM (2023) ==" - if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 50A5E157DFE548EC7C05E9D8D5933DAB6DEFD35E" --addsign $(cat $TMPSIG2023) + if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 50A5E157DFE548EC7C05E9D8D5933DAB6DEFD35E" --resign $(cat $TMPSIG2023) then echo done. else exit 1 fi fi if [ -s $TMPSIG2021 ]; then echo "== Signature des $(cat $TMPSIG2021 | wc -l) nouveaux RPM (2021) ==" - if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name B1ABF71E14C9D74897E198A8B19527F1478F8947" --addsign $(cat $TMPSIG2021) + if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name B1ABF71E14C9D74897E198A8B19527F1478F8947" --resign $(cat $TMPSIG2021) then echo done. else exit 1 fi fi if [ -s $TMPSIG2018 ]; then echo "== Signature des $(cat $TMPSIG2018 | wc -l) nouveaux RPM (2018) ==" - if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 6B38FEA7231F87F52B9CA9D8555097595F11735A" --addsign $(cat $TMPSIG2018) + if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 6B38FEA7231F87F52B9CA9D8555097595F11735A" --resign $(cat $TMPSIG2018) then echo done. else exit 1 fi fi if [ -s $TMPSIG2000 ]; then echo "== Signature des $(cat $TMPSIG2000 | wc -l) nouveaux RPM (old) ==" - if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56" --addsign $(cat $TMPSIG2000) + if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56" --resign $(cat $TMPSIG2000) then echo done. else exit 1 fi @@ -119,7 +119,7 @@ then echo "== Création des liens (noarch) ==" else echo "Rien à lier." fi -for dep in SRPMS fedora/{40,41,42}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} +for dep in SRPMS fedora/{41,42,43}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} do [[ $dep =~ /modular ]] && continue [[ $dep =~ /debug-modular ]] && continue @@ -155,6 +155,49 @@ data: EOT; +$template_valkey = <<< EOT +--- +document: modulemd +version: 2 +data: + name: valkey + stream: remi-@VERSION@ + version: @DATE@ + context: 00000000 + arch: @ARCH@ + summary: Valkey persistent key-value database + description: >- + Alternative valkey @VERSION@ module. + The remi-@VERSION@ stream provides more recent versions + and than default @VERSION@ stream. + license: + module: + - GPLv2+ + content: + - BSD and MIT + - CC-BY-SA + dependencies: + - buildrequires: + platform: [@DIST@] + requires: +@DEPS@ + references: + documentation: https://valkey.io/docs/ + tracker: https://github.com/valkey-io/valkey/issues + profiles: + common: + rpms: + - valkey + api: + rpms: + - valkey + artifacts: + rpms: +@RPMS@ +... + +EOT; + $template_memcached = <<< EOT --- document: modulemd @@ -391,295 +434,6 @@ 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"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f39']; - $mod .= genModule('fedora/39/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/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/39/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/39/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/39/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/39/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/39/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); - $mod .= genDefaults('memcached', false, ['remi']); - createRepo($dest, $mod); - - $dest = 'fedora/39/debug-modular/x86_64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f39']; - $mod .= genModule('fedora/39/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/39/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/39/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/39/debug-redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/39/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); - createRepo($dest, $mod); -} -if (in_array('f39', $_SERVER['argv']) || in_array('f39x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { - $dest = 'fedora/39/modular-test/x86_64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f39']; - $mod .= genModule('fedora/39/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); - createRepo($dest, $mod); - - $dest = 'fedora/39/debug-modular-test/x86_64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f39']; - $mod .= genModule('fedora/39/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); - createRepo($dest, $mod); -} - -if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array('f39a', $_SERVER['argv'])) { - $dest = 'fedora/39/modular/aarch64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f39']; - $mod .= genModule('fedora/39/php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/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/39/redis60/aarch64',$dest, '*.rpm', '6.0', 'aarch64', $deps, $template_redis); - $mod .= genModule('fedora/39/redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis); - $mod .= genModule('fedora/39/redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis); - $mod .= genModule('fedora/39/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/39/memcached/aarch64',$dest, '*.rpm', false, 'aarch64', $deps, $template_memcached); - $mod .= genDefaults('memcached', false, ['remi']); - createRepo($dest, $mod); - - $dest = 'fedora/39/debug-modular/aarch64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f39']; - $mod .= genModule('fedora/39/debug-php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-redis60/aarch64',$dest, '*.rpm', '6.0', 'aarch64', $deps, $template_redis); - $mod .= genModule('fedora/39/debug-redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis); - $mod .= genModule('fedora/39/debug-redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis); - $mod .= genModule('fedora/39/debug-redis72/aarch64',$dest, '*.rpm', '7.2', 'aarch64', $deps, $template_redis); - $mod .= genModule('fedora/39/debug-memcached/aarch64',$dest, '*.rpm', false, 'aarch64', $deps, $template_memcached); - createRepo($dest, $mod); -} -if (in_array('f39', $_SERVER['argv']) || in_array('f39a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { - $dest = 'fedora/39/modular-test/aarch64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f39']; - $mod .= genModule('fedora/39/test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); - createRepo($dest, $mod); - - $dest = 'fedora/39/debug-modular-test/aarch64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f39']; - $mod .= genModule('fedora/39/debug-test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/39/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); - $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"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f40']; - $mod .= genModule('fedora/40/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/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/40/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); - $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/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); - $mod .= genDefaults('memcached', false, ['remi']); - createRepo($dest, $mod); - - $dest = 'fedora/40/debug-modular/x86_64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f40']; - $mod .= genModule('fedora/40/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); - $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-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); - createRepo($dest, $mod); -} -if (in_array('f40', $_SERVER['argv']) || in_array('f40x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { - $dest = 'fedora/40/modular-test/x86_64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f40']; - $mod .= genModule('fedora/40/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); - createRepo($dest, $mod); - - $dest = 'fedora/40/debug-modular-test/x86_64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f40']; - $mod .= genModule('fedora/40/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); - createRepo($dest, $mod); -} - -if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array('f40a', $_SERVER['argv'])) { - $dest = 'fedora/40/modular/aarch64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f40']; - $mod .= genModule('fedora/40/php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/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/40/redis60/aarch64',$dest, '*.rpm', '6.0', 'aarch64', $deps, $template_redis); - $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/memcached/aarch64',$dest, '*.rpm', false, 'aarch64', $deps, $template_memcached); - $mod .= genDefaults('memcached', false, ['remi']); - createRepo($dest, $mod); - - $dest = 'fedora/40/debug-modular/aarch64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f40']; - $mod .= genModule('fedora/40/debug-php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-redis60/aarch64',$dest, '*.rpm', '6.0', 'aarch64', $deps, $template_redis); - $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-memcached/aarch64',$dest, '*.rpm', false, 'aarch64', $deps, $template_memcached); - createRepo($dest, $mod); -} -if (in_array('f40', $_SERVER['argv']) || in_array('f40a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { - $dest = 'fedora/40/modular-test/aarch64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f40']; - $mod .= genModule('fedora/40/test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); - createRepo($dest, $mod); - - $dest = 'fedora/40/debug-modular-test/aarch64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f40']; - $mod .= genModule('fedora/40/debug-test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/40/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); - 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'; @@ -694,7 +448,17 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $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/php85/x86_64', $dest, '*.rpm', '8.5', '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', 'remi-8.5']); + + $mod .= genModule('fedora/41/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/41/redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/41/redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); + + $mod .= genModule('fedora/41/valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey); + $mod .= genModule('fedora/41/valkey90/x86_64',$dest,'*.rpm', '9.0', 'x86_64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); createRepo($dest, $mod); $dest = 'fedora/41/debug-modular/x86_64'; @@ -709,6 +473,12 @@ 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-php85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/41/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/41/debug-redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/41/debug-redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/41/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey); + $mod .= genModule('fedora/41/debug-valkey90/x86_64',$dest,'*.rpm', '9.0', 'x86_64', $deps, $template_valkey); createRepo($dest, $mod); } if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -724,6 +494,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || i $mod .= genModule('fedora/41/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/41/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/41/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/41/test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); createRepo($dest, $mod); $dest = 'fedora/41/debug-modular-test/x86_64'; @@ -738,6 +509,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || i $mod .= genModule('fedora/41/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/41/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/41/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/41/debug-test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } @@ -754,7 +526,17 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $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/php85/aarch64', $dest, '*.rpm', '8.5', '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', 'remi-8.5']); + + $mod .= genModule('fedora/41/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/41/redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/41/redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); + + $mod .= genModule('fedora/41/valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); + $mod .= genModule('fedora/41/valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); createRepo($dest, $mod); $dest = 'fedora/41/debug-modular/aarch64'; @@ -769,6 +551,12 @@ 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-php85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/41/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/41/debug-redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/41/debug-redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/41/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); + $mod .= genModule('fedora/41/debug-valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); createRepo($dest, $mod); } if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -784,6 +572,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || i $mod .= genModule('fedora/41/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('fedora/41/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $mod .= genModule('fedora/41/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/41/test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); createRepo($dest, $mod); $dest = 'fedora/41/debug-modular-test/aarch64'; @@ -798,6 +587,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || i $mod .= genModule('fedora/41/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('fedora/41/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $mod .= genModule('fedora/41/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/41/debug-test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); createRepo($dest, $mod); } @@ -815,7 +605,17 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array $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/php85/x86_64', $dest, '*.rpm', '8.5', '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', 'remi-8.5']); + + $mod .= genModule('fedora/42/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/42/redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/42/redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); + + $mod .= genModule('fedora/42/valkey81/x86_64',$dest, '*.rpm', '8.1', 'x86_64', $deps, $template_valkey); + $mod .= genModule('fedora/42/valkey90/x86_64',$dest, '*.rpm', '9.0', 'x86_64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); createRepo($dest, $mod); $dest = 'fedora/42/debug-modular/x86_64'; @@ -830,6 +630,12 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array $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-php85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/42/debug-redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/42/debug-redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/42/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey); + $mod .= genModule('fedora/42/debug-valkey90/x86_64',$dest,'*.rpm', '9.0', 'x86_64', $deps, $template_valkey); createRepo($dest, $mod); } if (in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -845,6 +651,7 @@ if (in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv']) || i $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); + $mod .= genModule('fedora/42/test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); createRepo($dest, $mod); $dest = 'fedora/42/debug-modular-test/x86_64'; @@ -859,6 +666,7 @@ if (in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv']) || i $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); + $mod .= genModule('fedora/42/debug-test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } @@ -875,7 +683,17 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array $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/php85/aarch64', $dest, '*.rpm', '8.5', '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', 'remi-8.5']); + + $mod .= genModule('fedora/42/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/42/redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/42/redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); + + $mod .= genModule('fedora/42/valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); + $mod .= genModule('fedora/42/valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); createRepo($dest, $mod); $dest = 'fedora/42/debug-modular/aarch64'; @@ -890,6 +708,12 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array $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-php85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/42/debug-redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/42/debug-redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/42/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); + $mod .= genModule('fedora/42/debug-valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); createRepo($dest, $mod); } if (in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -905,6 +729,7 @@ if (in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv']) || i $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); + $mod .= genModule('fedora/42/test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); createRepo($dest, $mod); $dest = 'fedora/42/debug-modular-test/aarch64'; @@ -919,6 +744,164 @@ if (in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv']) || i $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); + $mod .= genModule('fedora/42/debug-test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); + createRepo($dest, $mod); +} + +// -------------- Fedora 43 ----------------------------------- +if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array('f43x', $_SERVER['argv'])) { + $dest = 'fedora/43/modular/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f43']; + $mod .= genModule('fedora/43/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/php85/x86_64', $dest, '*.rpm', '8.5', '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', 'remi-8.5']); + + $mod .= genModule('fedora/43/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/43/redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/43/redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); + + $mod .= genModule('fedora/43/valkey81/x86_64',$dest, '*.rpm', '8.1', 'x86_64', $deps, $template_valkey); + $mod .= genModule('fedora/43/valkey90/x86_64',$dest, '*.rpm', '9.0', 'x86_64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + createRepo($dest, $mod); + + $dest = 'fedora/43/debug-modular/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f43']; + $mod .= genModule('fedora/43/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-php85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/43/debug-redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/43/debug-redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/43/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey); + $mod .= genModule('fedora/43/debug-valkey90/x86_64',$dest,'*.rpm', '9.0', 'x86_64', $deps, $template_valkey); + createRepo($dest, $mod); +} +if (in_array('f43', $_SERVER['argv']) || in_array('f43x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { + $dest = 'fedora/43/modular-test/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f43']; + $mod .= genModule('fedora/43/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); + createRepo($dest, $mod); + + $dest = 'fedora/43/debug-modular-test/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f43']; + $mod .= genModule('fedora/43/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); + createRepo($dest, $mod); +} + +if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array('f43a', $_SERVER['argv'])) { + $dest = 'fedora/43/modular/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f43']; + $mod .= genModule('fedora/43/php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/php85/aarch64', $dest, '*.rpm', '8.5', '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', 'remi-8.5']); + + $mod .= genModule('fedora/43/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/43/redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/43/redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); + + $mod .= genModule('fedora/43/valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); + $mod .= genModule('fedora/43/valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + createRepo($dest, $mod); + + $dest = 'fedora/43/debug-modular/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f43']; + $mod .= genModule('fedora/43/debug-php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-php85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/43/debug-redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/43/debug-redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/43/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); + $mod .= genModule('fedora/43/debug-valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); + createRepo($dest, $mod); +} +if (in_array('f43', $_SERVER['argv']) || in_array('f43a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { + $dest = 'fedora/43/modular-test/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f43']; + $mod .= genModule('fedora/43/test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); + createRepo($dest, $mod); + + $dest = 'fedora/43/debug-modular-test/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f43']; + $mod .= genModule('fedora/43/debug-test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/43/debug-test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); createRepo($dest, $mod); } @@ -938,6 +921,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) || i $mod .= genModule('enterprise/8/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/8/test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/composer2-test/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); @@ -957,6 +941,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) || i $mod .= genModule('enterprise/8/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/8/debug-test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) @@ -976,7 +961,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); - $mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']); + $mod .= genModule('enterprise/8/php85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); + $mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4', 'remi-8.5']); $deps = ['platform' => 'el8']; $mod .= genModule('enterprise/8/redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); @@ -984,7 +970,14 @@ 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 .= genModule('enterprise/8/redis82/x86_64', $dest, 'redis*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/8/redis84/x86_64', $dest, 'redis*.rpm', '8.4', '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', 'remi-8.2', 'remi-8.4']); + + $mod .= genModule('enterprise/8/valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); + $mod .= genModule('enterprise/8/valkey90/x86_64',$dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/composer1/x86_64', $dest, '*.rpm', '1', 'x86_64', $deps, $template_comp); @@ -1008,6 +1001,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/8/debug-php85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); $deps = ['platform' => 'el8']; $mod .= genModule('enterprise/8/debug-redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); @@ -1015,6 +1009,11 @@ 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); + $mod .= genModule('enterprise/8/debug-redis82/x86_64', $dest, 'redis*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/8/debug-redis84/x86_64', $dest, 'redis*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/8/debug-valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); + $mod .= genModule('enterprise/8/debug-valkey90/x86_64',$dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); createRepo($dest, $mod); } @@ -1033,6 +1032,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv']) || i $mod .= genModule('enterprise/8/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/8/test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/composer2-test/x86_64', $dest, '*.rpm', '2', 'aarch64', $deps, $template_comp); @@ -1052,6 +1052,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv']) || i $mod .= genModule('enterprise/8/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/8/debug-test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); createRepo($dest, $mod); } if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv']) @@ -1071,14 +1072,22 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); - $mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']); + $mod .= genModule('enterprise/8/php85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); + $mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4', 'remi-8.5']); $deps = ['platform' => 'el8']; $mod .= genModule('enterprise/8/redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); $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 .= genModule('enterprise/8/redis82/aarch64', $dest, 'redis*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/8/redis84/aarch64', $dest, 'redis*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', '5', ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0', 'remi-8.2', 'remi-8.4']); + + $mod .= genModule('enterprise/8/valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); + $mod .= genModule('enterprise/8/valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/composer1/x86_64', $dest, '*.rpm', '1', 'aarch64', $deps, $template_comp); @@ -1102,12 +1111,18 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/8/debug-php85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); $deps = ['platform' => 'el8']; $mod .= genModule('enterprise/8/debug-redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); $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); + $mod .= genModule('enterprise/8/debug-redis82/aarch64', $dest, 'redis*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/8/debug-redis84/aarch64', $dest, 'redis*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/8/debug-valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); + $mod .= genModule('enterprise/8/debug-valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); createRepo($dest, $mod); } @@ -1124,6 +1139,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/9/test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); $deps = ['platform' => 'el9', 'php' => '']; $mod .= genModule('enterprise/9/composer2-test/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); @@ -1141,6 +1157,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/9/debug-test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } @@ -1158,14 +1175,22 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) $mod .= genModule('enterprise/9/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/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/9/php85/x86_64', $dest, '*.rpm', '8.5', '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', 'remi-8.5']); $mod .= genModule('enterprise/9/redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis70/x86_64', $dest, 'redis*.rpm', '7.0', 'x86_64', $deps, $template_redis); $mod .= 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 .= genModule('enterprise/9/redis82/x86_64', $dest, 'redis*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/9/redis84/x86_64', $dest, 'redis*.rpm', '8.4', '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', 'remi-8.2', 'remi-8.4']); + + $mod .= genModule('enterprise/9/valkey81/x86_64', $dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); + $mod .= genModule('enterprise/9/valkey90/x86_64', $dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); $mod .= genModule('enterprise/9/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); @@ -1187,12 +1212,18 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/9/debug-php85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis70/x86_64', $dest, 'redis*.rpm', '7.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/9/debug-redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/9/debug-redis82/x86_64', $dest, 'redis*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/9/debug-redis84/x86_64', $dest, 'redis*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/9/debug-valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); + $mod .= genModule('enterprise/9/debug-valkey90/x86_64',$dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/9/debug-memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached); createRepo($dest, $mod); @@ -1212,14 +1243,22 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) $mod .= genModule('enterprise/9/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/9/php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/9/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/9/php85/aarch64', $dest, '*.rpm', '8.5', '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', 'remi-8.5']); // $mod .= genModule('enterprise/9/redis50/aarch64', $dest, 'redis*.rpm', '5.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis62/aarch64', $dest, 'redis*.rpm', '6.2', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis70/aarch64', $dest, 'redis*.rpm', '7.0', 'aarch64', $deps, $template_redis); $mod .= 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 .= genModule('enterprise/9/redis82/aarch64', $dest, 'redis*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/9/redis84/aarch64', $dest, 'redis*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0', 'remi-8.2', 'remi-8.4']); + + $mod .= genModule('enterprise/9/valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); + $mod .= genModule('enterprise/9/valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); $mod .= genModule('enterprise/9/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); @@ -1241,12 +1280,18 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/9/debug-php85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); // $mod .= genModule('enterprise/9/debug-redis50/aarch64', $dest, 'redis*.rpm', '5.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis62/aarch64', $dest, 'redis*.rpm', '6.2', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis70/aarch64', $dest, 'redis*.rpm', '7.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-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-redis82/aarch64', $dest, 'redis*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/9/debug-redis84/aarch64', $dest, 'redis*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/9/debug-valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); + $mod .= genModule('enterprise/9/debug-valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/9/debug-memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); createRepo($dest, $mod); @@ -1265,6 +1310,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/9/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/9/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/9/test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); $deps = ['platform' => 'el9', 'php' => '']; $mod .= genModule('enterprise/9/composer2-test/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); @@ -1282,6 +1328,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/9/debug-test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); createRepo($dest, $mod); } @@ -1295,9 +1342,10 @@ 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); + $mod .= genModule('enterprise/10/test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); $deps = ['platform' => 'el10', 'php' => '']; $mod .= genModule('enterprise/10/composer2-test/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); @@ -1315,6 +1363,7 @@ if (in_array('el10', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/10/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/10/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/10/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/10/debug-test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } @@ -1332,7 +1381,18 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv']) $mod .= genModule('enterprise/10/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/10/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $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/php85/x86_64', $dest, '*.rpm', '8.5', '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', 'remi-8.5']); + + $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 .= genModule('enterprise/10/redis82/x86_64', $dest, 'redis*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/10/redis84/x86_64', $dest, 'redis*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-7.2', 'remi-8.0', 'remi-8.2', 'remi-8.4']); + + $mod .= genModule('enterprise/10/valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); + $mod .= genModule('enterprise/10/valkey90/x86_64',$dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); $mod .= genModule('enterprise/10/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); @@ -1354,12 +1414,19 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) { $mod .= genModule('enterprise/10/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/10/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/10/debug-php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/10/debug-php85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/10/debug-redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/10/debug-redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis); $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-redis82/x86_64', $dest, 'redis*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/10/debug-redis84/x86_64', $dest, 'redis*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/10/debug-valkey81/x86_64',$dest, 'redis*.rpm', '8.1', 'x86_64', $deps, $template_valkey); + $mod .= genModule('enterprise/10/debug-valkey90/x86_64',$dest, 'redis*.rpm', '9.0', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/10/debug-memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached); createRepo($dest, $mod); @@ -1379,7 +1446,18 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv']) $mod .= genModule('enterprise/10/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/10/php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $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/php85/aarch64', $dest, '*.rpm', '8.5', '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', 'remi-8.5']); + + $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 .= genModule('enterprise/10/redis82/aarch64', $dest, 'redis*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/10/redis84/aarch64', $dest, 'redis*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-7.2', 'remi-8.0', 'remi-8.2', 'remi-8.4']); + + $mod .= genModule('enterprise/10/valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); + $mod .= genModule('enterprise/10/valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); $mod .= genModule('enterprise/10/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); @@ -1401,6 +1479,14 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) { $mod .= genModule('enterprise/10/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $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-php85/aarch64', $dest, '*.rpm', '8.5', '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-redis82/aarch64', $dest, 'redis*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/10/debug-redis84/aarch64', $dest, 'redis*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/10/debug-valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); + $mod .= genModule('enterprise/10/debug-valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/10/debug-memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); createRepo($dest, $mod); @@ -1419,6 +1505,7 @@ if (in_array('el10', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/10/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/10/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/10/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/10/test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); $deps = ['platform' => 'el10', 'php' => '']; $mod .= genModule('enterprise/10/composer2-test/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); @@ -1436,6 +1523,7 @@ if (in_array('el10', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/10/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/10/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/10/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/10/debug-test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); createRepo($dest, $mod); } @@ -9,10 +9,10 @@ then ver=8 old=2 dst=/data/rpms/old -elif [ "$nom" = "SRPMS" ] +elif [ "$nom" = "SRPMS" -o "$nom" = "php8.4" ] then dis=fedora - ver=42 + ver=43 old=8 dst=/data/rpms/SRPMS.remi else @@ -71,7 +71,7 @@ if [ ${1:-check} != nocheck ]; then rpm -K *.rpm | grep -v 'signatures.*OK' | cut -d: -f1 | tee $TMP if [ -s $TMP ] then - rpmsign --define "_gpg_path $GPG_PATH" --define "_gpg_name $GPG_NAME" --addsign $(cat $TMP) + rpmsign --define "_gpg_path $GPG_PATH" --define "_gpg_name $GPG_NAME" --resign $(cat $TMP) else echo OK. fi @@ -1,14 +1,20 @@ #!/bin/bash if [ "$2" = "" ]; then - echo -e "\nusage: $0 [ options ] SRPM distro [ min_ver [, max_ver [, mock_options ]]]\n" + echo -e "\nusage: $0 [ options ] SRPM target [ min_ver [, max_ver [, mock_options ]]]\n" 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 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" + echo -e "Targets:" + echo -e "\tDistribution: el8a el8x el9a el9x el10a el10x fc41a fc41x fc42a fc42x fc43a fc43x" + echo -e "\tPHP: all, allx, zts" + echo -e "\tMemcached: memcached" + echo -e "\tLibraries: im6, im7, vips" + echo -e "\tRedis: r60, r62, r70, r72, r80, r82, r84" + echo -e "\tValkey: v81, v90\n" exit 0 fi @@ -39,6 +45,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 | \ @@ -83,20 +90,20 @@ else shift fi if [ "$1" = "" ]; then - MAX=84 + MAX=85 else MAX=$1 shift fi case $DIST in - *x|*xm|*xr) + *x|*xm|*xr|*xr62|*xr72|*xr80|*xr82|*xr84|*xv81|*xv90) if [ $SUF != x ]; then echo "Not an x86_64 builder" exit 1 fi ;; - *a|*am|*ar) + *a|*am|*ar|*ar62|*ar72|*ar80|*ar82|*ar84|*av81|*av90) if [ $SUF != a ]; then if [ $REDIS -ge 1 ]; then REMOTE=1 @@ -141,24 +148,38 @@ if [ $REMOTE -ge 1 ]; then SRPM=/home/remi/todo/$(basename $SRPM) fi +TARGET_IM6="el8xr el9x el8ar el9a" +TARGET_IM7="fc41x fc42x fc43x el8xr el9x el10x fc41a fc42a fc43a el8ar el9a el10a" + # PHP version matrix echo mockit $SRPM $DIST $MIN $MAX $@ case $DIST in - fc42x|fc42a|fc40x|fc40a|fc41x|fc41a|el9x|el9a|el10x|el10a) - LST="74 80 81 82 83 84" - SCL="74 80 81 82 83 84" + fc43x|fc43a|fc42x|fc42a|fc41x|fc41a|el9x|el9a|el10x|el10a) + LST="74 80 81 82 83 84 85" + 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" + LST="72 73 74 80 81 82 83 84 85" + 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" + LST="72 73 74 80 81 82 83 84 85" + SCL="56 70 71 72 73 74 80 81 82 83 84 85" ;; all) if [ $REDIS -ge 1 ]; then - for i in fc40x fc41x fc42x el8x el9x el10x fc40a fc41a fc42a el8a el9a el10a + for i in fc41x fc42x fc43x el8x el9x el10x fc41a fc42a fc43a 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 $@ + done + else + echo Not supported for direct build + fi + ;; + allx) + if [ $REDIS -ge 1 ]; then + for i in fc41x fc42x fc43x el8x el9x el10x do [ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@ [ $BUILD_SCLS -ge 1 ] && $0 --valkey --scl $SRPM $i $MIN $MAX $@ @@ -170,7 +191,7 @@ case $DIST in zts) if [ $REDIS -ge 1 ]; then [ $MAX -gt 83 ] && MAX=83 - for i in fc40x el8x el9x + for i in el8x el9x do [ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@ done @@ -180,7 +201,7 @@ case $DIST in ;; memcached) if [ $REDIS -ge 1 ]; then - for i in fc40xm fc41x fc42x el8x el9xm el10xm fc40am fc41a fc42a el8a el9am el10am + for i in fc41x fc42x fc43x el8x el9xm el10xm fc41a fc42a fc43a el8a el9am el10am do $0 --valkey --mock $SRPM $i $MIN $MAX $@ done @@ -190,7 +211,7 @@ case $DIST in ;; im6) if [ $REDIS -ge 1 ]; then - for i in fc40x el8xr el9x fc40a el8ar el9a + for i in $TARGET_IM6 do $0 --valkey --mock $SRPM $i $MIN $MAX $@ done @@ -200,7 +221,7 @@ case $DIST in ;; im7) if [ $REDIS -ge 1 ]; then - for i in fc40x fc41x fc42x el8xr el9x el10x fc40a fc41a fc42a el8ar el9a el10a + for i in $TARGET_IM7 do $0 --valkey --mock $SRPM $i $MIN $MAX $@ done @@ -208,6 +229,61 @@ case $DIST in echo Not supported for direct build fi ;; + vips) + if [ $REDIS -ge 1 ]; then + for i in $TARGET_IM6 + do + $0 --valkey --mock $SRPM $i $MIN $MAX --without heif --without im7 --with im6 + done + for i in $TARGET_IM7 + do + $0 --valkey --mock $SRPM $i $MIN $MAX --without heif --without im7 --with gm + $0 --valkey --mock $SRPM $i $MIN $MAX --with heif --with im7 + done + else + echo Not supported for direct build + fi + ;; + v81|v90) + if [ $REDIS -ge 1 ]; then + for i in fc42x fc43x fc41x el8x el9x el10x fc41a fc42a fc43a el8a el9a el10a + do + $0 --valkey --mock $SRPM ${i}${DIST} $MIN $MAX $@ + done + else + echo Not supported for direct build + fi + ;; + r80|r82|r84) + if [ $REDIS -ge 1 ]; then + for i in fc42x fc41x fc43x el8x el9x el10x fc41a fc42a fc43a 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 el8x el9x el10x 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 el8x el9x el8a el9a + do + $0 --valkey --mock $SRPM ${i}${DIST} $MIN $MAX $@ + done + else + echo Not supported for direct build + fi + ;; *) if [ $BUILD_MOCK -eq 0 -o ! -f ${mockref}/${DIST}.cfg ]; then [ $BUILD_MOCK -eq 0 ] && echo "BUILD_MOCK=0" @@ -9,6 +9,7 @@ else REDISCLI="valkey-cli -h remi" fi +START=$(date +%s) CHECK=$($REDISCLI ping) [ "$CHECK" = "PONG" ] || exit 1 @@ -46,6 +47,16 @@ do echo -en "\r$(date +%X) $RPM ${TXT:0:10} " $CMD --uniqueext=$PPID && echo " Ok." || echo " Error !" done - -echo "$(date +%X) Done" +# Elapsed time +END=$(date +%s) +DUR=$(expr $END - $START) +HOUR=$(expr $DUR / 3600) +MIN=$(expr $DUR % 3600 / 60) +SEC=$(expr $DUR % 60) +[ $SEC -lt 10 -a $DUR -gt 60 ] && SEC="0$SEC" +[ $MIN -lt 10 -a $HOUR -gt 0 ] && MIN="0$MIN" +DUR="${SEC}\"" +[ $MIN -gt 0 ] && DUR="${MIN}'${SEC}\"" +[ $HOUR -gt 0 ] && DUR="${HOUR}h${MIN}'${SEC}\"" +echo "$(date +%X) Done in ${DUR}" |
