diff options
| -rw-r--r-- | buildfct | 203 | ||||
| -rwxr-xr-x | cleanoldrpm | 5 | ||||
| -rwxr-xr-x | getmock | 219 | ||||
| -rw-r--r-- | mirrorsync | 79 | ||||
| -rwxr-xr-x | mkallrepo | 24 | ||||
| -rwxr-xr-x | mkgit | 12 | ||||
| -rwxr-xr-x | mkmodular | 348 | ||||
| -rwxr-xr-x | mkrepo | 12 | ||||
| -rwxr-xr-x | mockit | 130 | ||||
| -rwxr-xr-x | mockrun | 4 | ||||
| -rwxr-xr-x | pkgup | 2 |
11 files changed, 870 insertions, 168 deletions
@@ -11,6 +11,7 @@ alias mockfc39x80=" mock --configdir=$mocketc -r fc39x80 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 " @@ -29,6 +30,7 @@ alias mockfc40x80=" mock --configdir=$mocketc -r fc40x80 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 " @@ -47,12 +49,29 @@ alias mockfc41x80=" mock --configdir=$mocketc -r fc41x80 alias mockfc41x81=" mock --configdir=$mocketc -r fc41x81 rebuild " 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 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 mockfc42x=" mock --configdir=$mocketc -r fc42x rebuild " +alias mockfc42x74=" mock --configdir=$mocketc -r fc42x74 rebuild " +alias mockfc42x80=" mock --configdir=$mocketc -r fc42x80 rebuild " +alias mockfc42x81=" mock --configdir=$mocketc -r fc42x81 rebuild " +alias mockfc42x82=" mock --configdir=$mocketc -r fc42x82 rebuild " +alias mockfc42x83=" mock --configdir=$mocketc -r fc42x83 rebuild " +alias mockfc42x84=" mock --configdir=$mocketc -r fc42x84 rebuild " +alias mockfc42xscl74=" mock --configdir=$mocketc -r fc42xscl74 rebuild " +alias mockfc42xscl80=" mock --configdir=$mocketc -r fc42xscl80 rebuild " +alias mockfc42xscl81=" mock --configdir=$mocketc -r fc42xscl81 rebuild " +alias mockfc42xscl82=" mock --configdir=$mocketc -r fc42xscl82 rebuild " +alias mockfc42xscl83=" mock --configdir=$mocketc -r fc42xscl83 rebuild " +alias mockfc42xscl84=" mock --configdir=$mocketc -r fc42xscl84 rebuild " +alias mockfc42xscl85=" mock --configdir=$mocketc -r fc42xscl85 rebuild " alias mockel8x=" mock --configdir=$mocketc -r el8x rebuild " alias mockel8xr=" mock --configdir=$mocketc -r el8xr rebuild " @@ -66,6 +85,7 @@ alias mockel8n81=" mock --configdir=$mocketc -r el8n81 r alias mockel8x82=" mock --configdir=$mocketc -r el8x82 rebuild " 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 mockel8xscl56=" mock --configdir=$mocketc -r el8xscl56 rebuild " alias mockel8xscl70=" mock --configdir=$mocketc -r el8xscl70 rebuild " alias mockel8xscl71=" mock --configdir=$mocketc -r el8xscl71 rebuild " @@ -77,6 +97,7 @@ alias mockel8xscl81=" mock --configdir=$mocketc -r el8xscl81 r alias mockel8xscl82=" mock --configdir=$mocketc -r el8xscl82 rebuild " alias mockel8xscl83=" mock --configdir=$mocketc -r el8xscl83 rebuild " alias mockel8xscl84=" mock --configdir=$mocketc -r el8xscl84 rebuild " +alias mockel8xscl85=" mock --configdir=$mocketc -r el8xscl85 rebuild " alias mockel8xr60=" mock --configdir=$mocketc -r el8xr60 rebuild " alias mockel8xr62=" mock --configdir=$mocketc -r el8xr62 rebuild " alias mockel8xr70=" mock --configdir=$mocketc -r el8xr70 rebuild " @@ -93,18 +114,39 @@ alias mockel9n81=" mock --configdir=$mocketc -r el9n81 r alias mockel9x82=" mock --configdir=$mocketc -r el9x82 rebuild " 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 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 mockel9xm=" mock --configdir=$mocketc -r el9xm rebuild " +alias mockel10x=" mock --configdir=$mocketc -r el10x rebuild " +alias mockel10n=" mock --configdir=$mocketc -r el10n rebuild " +alias mockel10x74=" mock --configdir=$mocketc -r el10x74 rebuild " +alias mockel10x80=" mock --configdir=$mocketc -r el10x80 rebuild " +alias mockel10x81=" mock --configdir=$mocketc -r el10x81 rebuild " +alias mockel10n81=" mock --configdir=$mocketc -r el10n81 rebuild " +alias mockel10x82=" mock --configdir=$mocketc -r el10x82 rebuild " +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 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 mockel10xm=" mock --configdir=$mocketc -r el10xm rebuild " + alias mockepel872=" mock --configdir=$mocketc -r epel872 rebuild " alias mockepel873=" mock --configdir=$mocketc -r epel873 rebuild " alias mockepel874=" mock --configdir=$mocketc -r epel874 rebuild " @@ -145,13 +187,13 @@ if [ -f "$1" ]; then date +%X pids="" echo -n "" - (mock $quiet --configdir=$mocketc -r fc41x rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc40 Error !")& + (mock $quiet --configdir=$mocketc -r fc42x rebuild "$@" && echo "$(date +%X) (84) fc42 Ok." || echo "fc42 Error !")& pids="$pids $!" echo -n "" - (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (83) fc40 Ok." || echo "fc40 Error !")& + (mock $quiet --configdir=$mocketc -r fc41x rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc41 Error !")& pids="$pids $!" echo -n "" - (mock $quiet --configdir=$mocketc -r fc39x rebuild "$@" && echo "$(date +%X) (82) fc39 Ok." || echo "fc39 Error !")& + (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (83) fc40 Ok." || echo "fc40 Error !")& pids="$pids $!" echo -n "" (mock $quiet --configdir=$mocketc -r el8n81 rebuild "$@" && echo "$(date +%X) (81) el8 Ok." || echo "el8 Error !")& @@ -159,6 +201,9 @@ if [ -f "$1" ]; then echo -n "" (mock $quiet --configdir=$mocketc -r el9n81 rebuild "$@" && echo "$(date +%X) (81) el9 Ok." || echo "el9 Error !")& pids="$pids $!" + echo -n "" + (mock $quiet --configdir=$mocketc -r el10x rebuild "$@" && echo "$(date +%X) (83) el10 Ok." || echo "el10 Error !")& + pids="$pids $!" wait $pids date +%X else @@ -178,13 +223,13 @@ if [ -f "$1" ]; then date +%X pids="" echo -n "" - (mock $quiet --configdir=$mocketc -r fc41x rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc40 Error !")& + (mock $quiet --configdir=$mocketc -r fc42x rebuild "$@" && echo "$(date +%X) (84) fc42 Ok." || echo "fc42 Error !")& pids="$pids $!" echo -n "" - (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (83) fc40 Ok." || echo "fc40 Error !")& + (mock $quiet --configdir=$mocketc -r fc41x rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc40 Error !")& pids="$pids $!" echo -n "" - (mock $quiet --configdir=$mocketc -r fc39x rebuild "$@" && echo "$(date +%X) (82) fc39 Ok." || echo "fc39 Error !")& + (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (83) fc40 Ok." || echo "fc40 Error !")& pids="$pids $!" echo -n "" (mock $quiet --configdir=$mocketc -r el8n82 rebuild "$@" && echo "$(date +%X) (81) el8 Ok." || echo "el8 Error !")& @@ -192,6 +237,45 @@ if [ -f "$1" ]; then echo -n "" (mock $quiet --configdir=$mocketc -r el9n82 rebuild "$@" && echo "$(date +%X) (81) el9 Ok." || echo "el9 Error !")& pids="$pids $!" + echo -n "" + (mock $quiet --configdir=$mocketc -r el10x rebuild "$@" && echo "$(date +%X) (83) el10 Ok." || echo "el10 Error !")& + pids="$pids $!" + wait $pids + date +%X +else + echo "file not found '$1'" +fi +} + +# Build All distribution / version / noarch for remi using PHP >= 8.2 +mock83n() +{ +quiet="--quiet" +if [ "$1" = "-q" ]; then + shift +fi + +if [ -f "$1" ]; then + date +%X + pids="" + echo -n "" + (mock $quiet --configdir=$mocketc -r fc42x rebuild "$@" && echo "$(date +%X) (84) fc42 Ok." || echo "fc42 Error !")& + pids="$pids $!" + echo -n "" + (mock $quiet --configdir=$mocketc -r fc41x rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc40 Error !")& + pids="$pids $!" + echo -n "" + (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (83) fc40 Ok." || echo "fc40 Error !")& + pids="$pids $!" + echo -n "" + (mock $quiet --configdir=$mocketc -r el8n83 rebuild "$@" && echo "$(date +%X) (83) el8 Ok." || echo "el8 Error !")& + pids="$pids $!" + echo -n "" + (mock $quiet --configdir=$mocketc -r el9n83 rebuild "$@" && echo "$(date +%X) (83) el9 Ok." || echo "el9 Error !")& + pids="$pids $!" + echo -n "" + (mock $quiet --configdir=$mocketc -r el10x rebuild "$@" && echo "$(date +%X) (83) el10 Ok." || echo "el10 Error !")& + pids="$pids $!" wait $pids date +%X else @@ -272,12 +356,12 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 39 40 + for i in 41 40 42 do echo -n "$(date +%X) 74 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !" done - for i in 9 8 + for i in 10 9 8 do echo -n "$(date +%X) 74 el$i " mock $quiet --configdir=$mocketc -r el${i}x74 rebuild "$@" && echo " Ok." || echo " Error !" @@ -289,6 +373,32 @@ fi } # Build All distribution / version / 64bits for remi/scl-php84 +mockscl85x() +{ +quiet="" +if [ "$1" = "-q" ]; then + quiet="--quiet" + shift +fi + +if [ -f "$1" ]; then + for i in 42 41 + do + echo -n "$(date +%X) scl85 fc$i " + mock $quiet --configdir=$mocketc -r fc${i}xscl85 rebuild "$@" && echo " Ok." || echo " Error !" + done + for i in 8 9 10 + do + echo -n "$(date +%X) scl85 el$i " + mock $quiet --configdir=$mocketc -r el${i}xscl85 rebuild "$@" && echo " Ok." || echo " Error !" + done + date +%X +else + echo "file not found '$1'" +fi +} + +# Build All distribution / version / 64bits for remi/scl-php84 mockscl84x() { quiet="" @@ -298,12 +408,12 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 39 40 41 + for i in 42 41 40 do echo -n "$(date +%X) scl84 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl84 rebuild "$@" && echo " Ok." || echo " Error !" done - for i in 8 9 + for i in 8 9 10 do echo -n "$(date +%X) scl84 el$i " mock $quiet --configdir=$mocketc -r el${i}xscl84 rebuild "$@" && echo " Ok." || echo " Error !" @@ -324,12 +434,12 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 39 41 40 + for i in 41 42 40 do echo -n "$(date +%X) scl83 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !" done - for i in 8 9 + for i in 10 8 9 do echo -n "$(date +%X) scl83 el$i " mock $quiet --configdir=$mocketc -r el${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !" @@ -350,12 +460,12 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 39 40 41 + for i in 41 40 42 do echo -n "$(date +%X) scl82 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !" done - for i in 8 9 + for i in 8 10 9 do echo -n "$(date +%X) scl82 el$i " mock $quiet --configdir=$mocketc -r el${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !" @@ -376,12 +486,12 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 39 41 40 + for i in 42 41 40 do echo -n "$(date +%X) scl81 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !" done - for i in 8 9 + for i in 8 9 10 do echo -n "$(date +%X) scl81 el$i " mock $quiet --configdir=$mocketc -r el${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !" @@ -402,8 +512,6 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - echo -n "$(date +%X) r60 f39 " - mock $quiet --configdir=$mocketc -r fc39xr60 rebuild "$@" && echo " Ok." || echo " Error !" echo -n "$(date +%X) r60 el9 " mock $quiet --configdir=$mocketc -r el9xr60 rebuild "$@" && echo " Ok." || echo " Error !" echo -n "$(date +%X) r60 el8 " @@ -424,8 +532,6 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - echo -n "$(date +%X) r62 f39 " - mock $quiet --configdir=$mocketc -r fc39xr62 rebuild "$@" && echo " Ok." || echo " Error !" echo -n "$(date +%X) r62 el9 " mock $quiet --configdir=$mocketc -r el9xr62 rebuild "$@" && echo " Ok." || echo " Error !" echo -n "$(date +%X) r62 el8 " @@ -446,8 +552,6 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - echo -n "$(date +%X) r72 f39 " - mock $quiet --configdir=$mocketc -r fc39xr72 rebuild "$@" && echo " Ok." || echo " Error !" echo -n "$(date +%X) r72 el9 " mock $quiet --configdir=$mocketc -r el9xr72 rebuild "$@" && echo " Ok." || echo " Error !" echo -n "$(date +%X) r72 el8 " @@ -468,8 +572,6 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - echo -n "$(date +%X) r70 f39 " - mock $quiet --configdir=$mocketc -r fc39xr70 rebuild "$@" && echo " Ok." || echo " Error !" echo -n "$(date +%X) r70 el9 " mock $quiet --configdir=$mocketc -r el9xr70 rebuild "$@" && echo " Ok." || echo " Error !" echo -n "$(date +%X) r70 el8 " @@ -480,8 +582,8 @@ else fi } -# Build All distribution / version / 64bits for remi/remi-php83 -mock83x() +# Build All distribution / version / 64bits for remi/remi-php84 +mock84x() { quiet="" if [ "$1" = "-q" ]; then @@ -490,15 +592,15 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 40 39 + for i in 41 42 40 do - echo -n "$(date +%X) 83 fc$i " - mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !" + echo -n "$(date +%X) 84 fc$i " + mock $quiet --configdir=$mocketc -r fc${i}x84 rebuild "$@" && echo " Ok." || echo " Error !" done - for i in 8 9 + for i in 8 9 10 do - echo -n "$(date +%X) 83 el$i " - mock $quiet --configdir=$mocketc -r el${i}x83 rebuild "$@"&& echo " Ok." || echo " Error !" + echo -n "$(date +%X) 84 el$i " + mock $quiet --configdir=$mocketc -r el${i}x84 rebuild "$@"&& echo " Ok." || echo " Error !" done date +%X else @@ -507,7 +609,7 @@ fi } # Build All distribution / version / 64bits for remi/remi-php83 -mock83el() +mock83x() { quiet="" if [ "$1" = "-q" ]; then @@ -516,7 +618,12 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 8 9 + for i in 42 41 40 + do + echo -n "$(date +%X) 83 fc$i " + mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !" + done + for i in 8 9 10 do echo -n "$(date +%X) 83 el$i " mock $quiet --configdir=$mocketc -r el${i}x83 rebuild "$@"&& echo " Ok." || echo " Error !" @@ -528,7 +635,7 @@ fi } # Build All distribution / version / 64bits for remi/remi-php83 -mock83fc() +mock83el() { quiet="" if [ "$1" = "-q" ]; then @@ -537,10 +644,10 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 39 + for i in 8 9 do - echo -n "$(date +%X) 83 fc$i " - mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !" + echo -n "$(date +%X) 83 el$i " + mock $quiet --configdir=$mocketc -r el${i}x83 rebuild "$@"&& echo " Ok." || echo " Error !" done date +%X else @@ -558,12 +665,12 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 40 41 39 + for i in 41 40 42 do echo -n "$(date +%X) 82 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !" done - for i in 8 9 + for i in 8 10 9 do echo -n "$(date +%X) 82 el$i " mock $quiet --configdir=$mocketc -r el${i}x82 rebuild "$@"&& echo " Ok." || echo " Error !" @@ -584,12 +691,12 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 40 39 41 + for i in 41 42 40 do echo -n "$(date +%X) 81 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !" done - for i in 8 9 + for i in 8 9 10 do echo -n "$(date +%X) 81 el$i " mock $quiet --configdir=$mocketc -r el${i}x81 rebuild "$@"&& echo " Ok." || echo " Error !" @@ -610,12 +717,12 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 39 41 40 + for i in 42 41 40 do echo -n "$(date +%X) 80 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !" done - for i in 9 8 + for i in 10 9 8 do echo -n "$(date +%X) 80 el$i " mock $quiet --configdir=$mocketc -r el${i}x80 rebuild "$@"&& echo " Ok." || echo " Error !" @@ -636,12 +743,12 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 39 40 41 + for i in 41 42 40 do echo -n "$(date +%X) scl80 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !" done - for i in 9 8 + for i in 9 8 10 do echo -n "$(date +%X) scl80 el$i " mock $quiet --configdir=$mocketc -r el${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !" @@ -662,12 +769,12 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 40 41 39 + for i in 41 40 42 do echo -n "$(date +%X) scl74 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !" done - for i in 9 8 + for i in 9 8 10 do echo -n "$(date +%X) scl74 el$i " mock $quiet --configdir=$mocketc -r el${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !" diff --git a/cleanoldrpm b/cleanoldrpm index d4e257f..e4ee205 100755 --- a/cleanoldrpm +++ b/cleanoldrpm @@ -9,6 +9,10 @@ $dest = false; $multi = [ 'php' => 3, // php/8.0 'php-pecl-protobuf' => 1, // php-pecl-protobuf/3 + 'php81-php-pecl-protobuf' => 1, + 'php82-php-pecl-protobuf' => 1, + 'php83-php-pecl-protobuf' => 1, + 'php84-php-pecl-protobuf' => 1, 'njs' => 99, // njs/0.8.2 'libnjs-devel' => 99, // 'redis' => 3, // redis/6.2 @@ -22,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]; @@ -80,6 +80,16 @@ el??74) fi type=enterprise ;; +el???74) + dep=${1:2:2} + if [ "$2" == "php74" -o "$2" == "test74" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php74 + else rep=${2}74 + fi + type=enterprise + ;; el??80) dep=${1:2:1} if [ "$2" == "php80" -o "$2" == "test80" ] @@ -90,6 +100,16 @@ el??80) fi type=enterprise ;; +el???80) + dep=${1:2:2} + if [ "$2" == "php80" -o "$2" == "test80" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php80 + else rep=${2}80 + fi + type=enterprise + ;; el??81) dep=${1:2:1} if [ "$2" == "php81" -o "$2" == "test81" ] @@ -100,6 +120,16 @@ el??81) fi type=enterprise ;; +el???81) + dep=${1:2:2} + if [ "$2" == "php81" -o "$2" == "test81" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php81 + else rep=${2}81 + fi + type=enterprise + ;; el??82) dep=${1:2:1} if [ "$2" == "php82" -o "$2" == "test82" ] @@ -110,6 +140,16 @@ el??82) fi type=enterprise ;; +el???82) + dep=${1:2:2} + if [ "$2" == "php82" -o "$2" == "test82" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php82 + else rep=${2}82 + fi + type=enterprise + ;; el??83) dep=${1:2:1} if [ "$2" == "php83" -o "$2" == "test83" ] @@ -120,6 +160,36 @@ el??83) fi type=enterprise ;; +el???83) + dep=${1:2:2} + if [ "$2" == "php83" -o "$2" == "test83" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php83 + else rep=${2}83 + fi + type=enterprise + ;; +el??84) + dep=${1:2:1} + if [ "$2" == "php84" -o "$2" == "test84" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php84 + else rep=${2}84 + fi + type=enterprise + ;; +el???84) + dep=${1:2:2} + if [ "$2" == "php84" -o "$2" == "test84" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php84 + else rep=${2}84 + fi + type=enterprise + ;; fc???74) dep=${1:2:2} if [ "$2" == "php74" -o "$2" == "test74" ] @@ -170,6 +240,16 @@ fc???83) fi type=fedora ;; +fc???84) + dep=${1:2:2} + if [ "$2" == "php84" -o "$2" == "test84" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php84 + else rep=${2}84 + fi + type=fedora + ;; el*) dep=${dep#el} type=enterprise ;; @@ -205,7 +285,7 @@ then debug=$type/$dep/debug-$rep/ else echo "$1 n'est pas un dépôt ($type/$dep/$rep)" - exit 2 + return fi if [ -d /var/lib/mock/${1}/repodata ]; then @@ -217,8 +297,8 @@ elif [ -d /var/lib/mock/${1}i/result ]; then elif [ -d /var/lib/mock/$1/result ]; then src=/var/lib/mock/$1/result else - echo "$1 n'est pas un dossier mock" - exit 2 + echo "$1 n'est pas un dossier mock (missing repodata or result)" + return fi echo Copie de $src vers $cible @@ -245,6 +325,13 @@ do cp $i priv/el9.x86_64 && echo + $i copied priv EL9 fi ;; + remi-crypto*el10*) + if [ -f priv/el10.x86_64/$j ]; then + echo " " $i already there + else + cp $i priv/el10.x86_64 && echo + $i copied priv EL10 + fi + ;; remi-crypto*fc41*) if [ -f priv/fc41.x86_64/$j ]; then echo " " $i already there @@ -252,6 +339,13 @@ do cp $i priv/fc41.x86_64 && echo + $i copied priv FC41 fi ;; + remi-crypto*fc42*) + if [ -f priv/fc42.x86_64/$j ]; then + echo " " $i already there + else + cp $i priv/fc42.x86_64 && echo + $i copied priv FC42 + fi + ;; remi-crypto*fc40*) if [ -f priv/fc40.x86_64/$j ]; then echo " " $i already there @@ -419,67 +513,101 @@ elif [ $1 = all73 ]; then elif [ $1 = all74 ]; then [ $opt = remi ] && opt=php74 [ $opt = test ] && opt=test74 - getOneMock fc39x74 $opt '*7.4*' - getOneMock fc39a74 $opt '*7.4*' + getOneMock fc42x74 $opt '*7.4*' + getOneMock fc42a74 $opt '*7.4*' getOneMock fc40x74 $opt '*7.4*' getOneMock fc40a74 $opt '*7.4*' + getOneMock fc41x74 $opt '*7.4*' + 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*' elif [ $1 = all80 ]; then [ $opt = remi ] && opt=php80 [ $opt = test ] && opt=test80 - getOneMock fc39x80 $opt '*8.0*' - getOneMock fc39a80 $opt '*8.0*' + getOneMock fc42x80 $opt '*8.0*' + getOneMock fc42a80 $opt '*8.0*' getOneMock fc40x80 $opt '*8.0*' getOneMock fc40a80 $opt '*8.0*' + getOneMock fc41x80 $opt '*8.0*' + 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*' elif [ $1 = all81 ]; then [ $opt = remi ] && opt=php81 [ $opt = test ] && opt=test81 - getOneMock fc39x81 $opt '*8.1*' - getOneMock fc39a81 $opt '*8.1*' + getOneMock fc42x81 $opt '*8.1*' + getOneMock fc42a81 $opt '*8.1*' getOneMock fc40x81 $opt '*8.1*' getOneMock fc40a81 $opt '*8.1*' + getOneMock fc41x81 $opt '*8.1*' + 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*' elif [ $1 = all82 ]; then [ $opt = remi ] && opt=php82 [ $opt = test ] && opt=test82 - getOneMock fc39x82 $opt '*8.2*' - getOneMock fc39a82 $opt '*8.2*' + getOneMock fc42x82 $opt '*8.2*' + getOneMock fc42a82 $opt '*8.2*' getOneMock fc40x82 $opt '*8.2*' getOneMock fc40a82 $opt '*8.2*' + getOneMock fc41x82 $opt '*8.2*' + 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*' elif [ $1 = all83 ]; then [ $opt = remi ] && opt=php83 [ $opt = test ] && opt=test83 - getOneMock fc39x83 $opt '*8.3*' - getOneMock fc39a83 $opt '*8.3*' + getOneMock fc42x83 $opt '*8.3*' + getOneMock fc42a83 $opt '*8.3*' getOneMock fc40x83 $opt '*8.3*' getOneMock fc40a83 $opt '*8.3*' + getOneMock fc41x83 $opt '*8.3*' + 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*' + +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*' elif [ $1 = allr60 ]; then opt=redis60 - getOneMock fc39x $opt '*6.0*' - getOneMock fc39a $opt '*6.0*' getOneMock fc40x $opt '*6.0*' getOneMock fc40a $opt '*6.0*' getOneMock el8x $opt '*6.0*' @@ -489,8 +617,6 @@ elif [ $1 = allr60 ]; then elif [ $1 = allr62 ]; then opt=redis62 - getOneMock fc39x $opt '*6.2*' - getOneMock fc39a $opt '*6.2*' getOneMock fc40x $opt '*6.2*' getOneMock fc40a $opt '*6.2*' getOneMock el8x $opt '*6.2*' @@ -500,8 +626,6 @@ elif [ $1 = allr62 ]; then elif [ $1 = allr70 ]; then opt=redis70 - getOneMock fc39x $opt '*7.0*' - getOneMock fc39a $opt '*7.0*' getOneMock fc40x $opt '*7.0*' getOneMock fc40a $opt '*7.0*' getOneMock el8x $opt '*7.0*' @@ -511,8 +635,6 @@ elif [ $1 = allr70 ]; then elif [ $1 = allr72 ]; then opt=redis72 - getOneMock fc39x $opt '*7.2*' - getOneMock fc39a $opt '*7.2*' getOneMock fc40x $opt '*7.2*' getOneMock fc40a $opt '*7.2*' getOneMock el8x $opt '*7.2*' @@ -524,32 +646,36 @@ elif [ $1 = allm ]; then opt=remi getOneMock el8x $opt '*1.6*' getOneMock el8a $opt '*1.6*' + getOneMock fc41x $opt '*1.6*' + getOneMock fc41a $opt '*1.6*' + getOneMock fc42x $opt '*1.6*' + getOneMock fc42a $opt '*1.6*' opt=memcached - getOneMock fc39x $opt '*1.6*' - getOneMock fc39a $opt '*1.6*' getOneMock fc40x $opt '*1.6*' getOneMock fc40a $opt '*1.6*' getOneMock el9x $opt '*1.6*' getOneMock el9a $opt '*1.6*' + getOneMock el10x $opt '*1.6*' + getOneMock el10a $opt '*1.6*' elif [ $1 = allx ]; then - for i in 39 40 + for i in 8 9 10 do - getOneMock fc${i}x $opt + (getOneMock el${i}x $opt) done - for i in 8 9 + for i in 40 41 42 do - getOneMock el${i}x $opt + (getOneMock fc${i}x $opt) done elif [ $1 = alla ]; then - for i in 39 40 + for i in 8 9 10 do - getOneMock fc${i}a $opt + (getOneMock el${i}a $opt) done - for i in 8 9 + for i in 40 41 42 do - getOneMock el${i}a $opt + (getOneMock fc${i}a $opt) done elif [ $1 = scl56 ]; then @@ -571,42 +697,42 @@ elif [ $1 = scl71 ]; then done elif [ $1 = scl84 ]; then - for dis in fc39 fc40 fc41 el8 el9 + for dis in fc40 fc41 fc42 el8 el9 el10 do - getOneMock scl84${dis}a $opt getOneMock scl84${dis}x $opt + getOneMock scl84${dis}a $opt done elif [ $1 = scl83 ]; then - for dis in fc39 fc40 fc41 el8 el9 + for dis in fc40 fc41 fc42 el8 el9 el10 do getOneMock scl83${dis}x $opt getOneMock scl83${dis}a $opt done elif [ $1 = scl82 ]; then - for dis in fc39 fc40 fc41 el8 el9 + for dis in fc40 fc41 fc42 el8 el9 el10 do getOneMock scl82${dis}x $opt getOneMock scl82${dis}a $opt done elif [ $1 = scl81 ]; then - for dis in fc39 fc40 fc41 el8 el9 + for dis in fc40 fc41 fc42 el8 el9 el10 do getOneMock scl81${dis}x $opt getOneMock scl81${dis}a $opt done elif [ $1 = scl80 ]; then - for dis in fc39 fc40 fc41 el8 el9 + for dis in fc42 fc40 fc41 el8 el9 el10 do getOneMock scl80${dis}x $opt getOneMock scl80${dis}a $opt done elif [ $1 = scl74 ]; then - for dis in fc39 fc40 fc41 el8 el9 + for dis in fc42 fc40 fc41 el8 el9 el10 do getOneMock scl74${dis}x $opt getOneMock scl74${dis}a $opt @@ -628,16 +754,29 @@ elif [ $1 = scl72 ]; then elif [ $1 = allphp ]; then LOG=$(mktemp out.XXXXXXXXXX) - MOD="all72 all73 all74 all80 all81 all82 all83" + MOD="all72 all73 all74 all80 all81 all82 all83 all84" SCL="scl56 scl70 scl71 scl72 scl73 scl74 scl80 scl81 scl82 scl83 scl84" for i in $SCL $MOD do $0 $opt $i | tee $LOG - if grep -q '64\.rpm' $LOG && grep -q 'Aucun' $LOG + if grep -q '64\.rpm' $LOG && grep -q 'pas un dossier mock' $LOG then echo -en "\n> $i - [enter] >"; read rep fi done rm -f $LOG +elif [ $1 = all42 ]; then + LOG=$(mktemp out.XXXXXXXXXX) + MOD="74 80 81 82 83 84" + for v in $MOD; do + for i in fc42x${v} fc42a${v} scl${v}fc42x scl${v}fc42a; do + $0 $opt $i | tee $LOG + if grep -q '64\.rpm' $LOG && grep -q 'pas un dossier mock' $LOG + then + echo -en "\n> $i - [enter] >"; read rep + fi + done + done + rm -f $LOG else for i in $* do @@ -32,20 +32,6 @@ # SOFTWARE. # -# Find rsync in default path -rsync_run(){ - if command -v rsync >/dev/null; then - command rsync "$@"; - else - command -p rsync "$@"; - fi; -} - -# You can change v to q if you do not want detailed logging -# You may also add additional excludes if you don't want to provide certain -# repositories or architectures. -opts=(-avSH --exclude="*.~tmp~" --delete-delay --delay-updates) - # Please use a mirror geographically close to you for initial sync, # or if you are hosting a private mirror (not publicly available). # @@ -57,24 +43,52 @@ opts=(-avSH --exclude="*.~tmp~" --delete-delay --delay-updates) # A complete list of mirrors can be found at # https://rpms.remirepo.net/ -# Enterprise repo source -src1="rsync://rpms.remirepo.net/enterprise/" -# Fedora repo source -src2="rsync://rpms.remirepo.net/fedora/" - +##### TO BE ADAPTED TO YOUR CONFIGURATION ##### +# sync from primary mirror only allowed to official mirrors +src="rsync://rpms.remirepo.net" # Your local path. Change to whatever fits your system. +dst=/mnt/RepoSync # $mirrormodule is also used in syslog output. +# ${dst}/${mirrormodule}/enterprise MUST exists +# ${dst}/${mirrormodule}/fedora MUST exists mirrormodule="Remi" -dst1="/mnt/RepoSync/${mirrormodule}/enterprise" -dst2="/mnt/RepoSync/${mirrormodule}/fedora" +# You can change v to q if you do not want detailed logging +# You may also add additional excludes if you don't want to provide certain +# repositories or architectures. +opts=(-avSH --exclude="*.~tmp~" --delete-delay --delay-updates) +##### END OF TO BE ADAPTED ##### + +# Enterprise repo +src1="${src}/enterprise" +dst1="${dst}/${mirrormodule}/enterprise" +# Fedora repo +src2="${src}/fedora" +dst2="${dst}/${mirrormodule}/fedora" datefile="date" lockfile="$0.lockfile" logfile="$0.log" +# Find rsync in default path +rsync_run(){ + if command -v rsync >/dev/null; then + command rsync "$@"; + else + command -p rsync "$@"; + fi; +} + +if [ ! -d ${dst1} ]; then + echo "${dst1} directory does not exist" + exit 1 +fi +if [ ! -d ${dst2} ]; then + echo "${dst2} directory does not exist" + exit 1 +fi # Always pull the index.html to ensure the latest. curl/wget would still use same bandiwdth to check if the page changed even # if we aren't going to save a new copy -wget https://rpms.remirepo.net/index.html -O /mnt/RepoSync/${mirrormodule}/index.html +wget https://rpms.remirepo.net/index.html -O ${dst}/${mirrormodule}/index.html >> "$logfile" 2>&1 # Check if the datefile has changed on upstream mirror # and exit cleanly if it is still the same @@ -106,19 +120,28 @@ fi # The actual syncing part printf '%s\n' "$$" > "$lockfile" printf "Started update at %(%c)T\n" -1 >> "$logfile" 2>&1 -logger -t rsync "Updating ${mirrormodule}" - # Sync src1/dst1 if there are changes if [[ -n "$checkresult1" ]]; then - rsync_run "${opts[@]}" "${src1}/" "${dst1}/" >> "$logfile" 2>&1 + logger -t rsync "Updating ${mirrormodule} for ${dst1}" + if rsync_run "${opts[@]}" "${src1}/" "${dst1}/" >> "$logfile" 2>&1; then + logger -t rsync "Succeed updating ${mirrormodule}" + else + logger -t rsync "Failed updating ${mirrormodule} see ${logfile}" + rm -f ${dst1}/${datefile} + fi fi # Sync src2/dst2 if there are changes if [[ -n "$checkresult2" ]]; then - rsync_run "${opts[@]}" "${src2}/" "${dst2}/" >> "$logfile" 2>&1 + logger -t rsync "Updating ${mirrormodule} for ${dst2}" + if rsync_run "${opts[@]}" "${src2}/" "${dst2}/" >> "$logfile" 2>&1; then + logger -t rsync "Succeed updating ${mirrormodule}" + else + logger -t rsync "Failed updating ${mirrormodule} see ${logfile}" + rm -f ${dst2}/${datefile} + fi fi -logger -t rsync "Finished updating ${mirrormodule}" printf "End: %(%c)T\n" -1 >> "$logfile" 2>&1 -rm -f "$lockfile"
\ No newline at end of file +rm -f "$lockfile" @@ -7,10 +7,11 @@ TMPSIG2018=$(mktemp -t XXXXXXXX.2018) TMPSIG2021=$(mktemp -t XXXXXXXX.2021) TMPSIG2023=$(mktemp -t XXXXXXXX.2023) TMPSIG2024=$(mktemp -t XXXXXXXX.2024) +TMPSIG2025=$(mktemp -t XXXXXXXX.2025) cd /home/rpmbuild/site/rpms -for dep in fedora/{39,40,41}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64} +for dep in fedora/{40,41,42}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} do [[ $dep =~ /modular ]] && continue [[ $dep =~ /debug-modular ]] && continue @@ -33,8 +34,11 @@ do fi done -find SRPMS -name \*.rpm -a -newer SRPMS/repodata -print >>$TMPSIG +# if something added in SRPMS, search for new SRPM +if [ SRPMS -nt SRPMS/repodata ]; then + find SRPMS -name \*.rpm \( -newer SRPMS/repodata -o -mtime -1 \) -print >>$TMPSIG +fi if [ -s $TMPSIG ]; then echo "À signer:"; sort < $TMPSIG @@ -48,10 +52,20 @@ if [ -s $TMPSIG ]; then # 2023 grep fc39 $TMPSIG > $TMPSIG2023 # 2024 - grep src.rpm $TMPSIG > $TMPSIG2024 - grep fc40 $TMPSIG >> $TMPSIG2024 + grep fc40 $TMPSIG > $TMPSIG2024 grep fc41 $TMPSIG >> $TMPSIG2024 + grep el10 $TMPSIG >> $TMPSIG2024 + # 2025 + grep src.rpm $TMPSIG > $TMPSIG2025 + grep fc42 $TMPSIG >> $TMPSIG2025 + if [ -s $TMPSIG2025 ]; then + echo "== Signature des $(cat $TMPSIG2025 | wc -l) nouveaux RPM (2025) ==" + if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 83833E4687A4AA03B6AC94F2061566968F1F4B2D" --addsign $(cat $TMPSIG2025) + then echo done. + else exit 1 + fi + fi if [ -s $TMPSIG2024 ]; then echo "== Signature des $(cat $TMPSIG2024 | wc -l) nouveaux RPM (2024) ==" if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4" --addsign $(cat $TMPSIG2024) @@ -105,7 +119,7 @@ then echo "== Création des liens (noarch) ==" else echo "Rien à lier." fi -for dep in SRPMS fedora/{39,40,41}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64} +for dep in SRPMS fedora/{40,41,42}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} do [[ $dep =~ /modular ]] && continue [[ $dep =~ /debug-modular ]] && continue @@ -6,6 +6,18 @@ if [ -z "$1" ]; then exit 1 fi +case $1 in + rpms/*) + ;; + tools/*) + ;; + web/*) + ;; + *) + echo "Prefix not allowed (rpms/tools/web)" + exit 1 +esac + GIT=${1%/} LOC=$(basename $GIT) @@ -346,7 +346,9 @@ chdir($dest); [$dis,$ver]=explode("/", $dest); $GPG_PATH="/home/remi/.gnupgrpm"; if ($dis == "fedora") { - if ($ver >= 40) { + if ($ver >= 42) { + $GPG_NAME="83833E4687A4AA03B6AC94F2061566968F1F4B2D"; + } else if ($ver >= 40) { $GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4"; } else if ($ver >= 38) { $GPG_NAME="50A5E157DFE548EC7C05E9D8D5933DAB6DEFD35E"; @@ -360,7 +362,9 @@ if ($dis == "fedora") { $GPG_NAME="5F136145BF10369B7685D8DE503666CCBBAE6F1B"; } } else { - if ($ver >= 9) { + if ($ver >= 10) { + $GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4"; + } else if ($ver >= 9) { $GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947"; } else if ($ver == 8) { $GPG_NAME="6B38FEA7231F87F52B9CA9D8555097595F11735A"; @@ -387,6 +391,7 @@ exec("gpg --armor --detach-sign --default-key \"$GPG_NAME\" --homedir \"$GPG_PAT chdir($old); } +/* if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array('f39x', $_SERVER['argv'])) { $dest = 'fedora/39/modular/x86_64'; echo "Populate $dest\n"; @@ -399,7 +404,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array $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 .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); + $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); @@ -420,6 +426,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array $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); @@ -439,6 +446,7 @@ if (in_array('f39', $_SERVER['argv']) || in_array('f39x', $_SERVER['argv']) || i $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'; @@ -452,6 +460,7 @@ if (in_array('f39', $_SERVER['argv']) || in_array('f39x', $_SERVER['argv']) || i $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); } @@ -467,7 +476,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array $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 .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); + $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); @@ -488,6 +498,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array $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); @@ -507,6 +518,7 @@ if (in_array('f39', $_SERVER['argv']) || in_array('f39a', $_SERVER['argv']) || i $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'; @@ -520,9 +532,10 @@ if (in_array('f39', $_SERVER['argv']) || in_array('f39a', $_SERVER['argv']) || i $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"; @@ -535,7 +548,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array $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 .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); + $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); @@ -556,6 +570,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array $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); @@ -575,6 +590,7 @@ if (in_array('f40', $_SERVER['argv']) || in_array('f40x', $_SERVER['argv']) || i $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'; @@ -588,6 +604,7 @@ if (in_array('f40', $_SERVER['argv']) || in_array('f40x', $_SERVER['argv']) || i $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); } @@ -603,7 +620,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array $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 .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); + $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); @@ -624,6 +642,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array $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); @@ -643,6 +662,7 @@ if (in_array('f40', $_SERVER['argv']) || in_array('f40a', $_SERVER['argv']) || i $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'; @@ -656,9 +676,11 @@ if (in_array('f40', $_SERVER['argv']) || in_array('f40a', $_SERVER['argv']) || i $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'; echo "Populate $dest\n"; @@ -671,7 +693,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $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 .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); + $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']); createRepo($dest, $mod); $dest = 'fedora/41/debug-modular/x86_64'; @@ -685,6 +708,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $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); createRepo($dest, $mod); } if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -699,6 +723,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || i $mod .= genModule('fedora/41/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $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); createRepo($dest, $mod); $dest = 'fedora/41/debug-modular-test/x86_64'; @@ -712,6 +737,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || i $mod .= genModule('fedora/41/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $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); createRepo($dest, $mod); } @@ -727,7 +753,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $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 .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); + $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']); createRepo($dest, $mod); $dest = 'fedora/41/debug-modular/aarch64'; @@ -741,6 +768,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $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); createRepo($dest, $mod); } if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -755,6 +783,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || i $mod .= genModule('fedora/41/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $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); createRepo($dest, $mod); $dest = 'fedora/41/debug-modular-test/aarch64'; @@ -768,8 +797,131 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || i $mod .= genModule('fedora/41/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $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); + createRepo($dest, $mod); +} + +// -------------- Fedora 42 ----------------------------------- +if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv'])) { + $dest = 'fedora/42/modular/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f42']; + $mod .= genModule('fedora/42/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']); + createRepo($dest, $mod); + + $dest = 'fedora/42/debug-modular/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f42']; + $mod .= genModule('fedora/42/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } +if (in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { + $dest = 'fedora/42/modular-test/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f42']; + $mod .= genModule('fedora/42/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + createRepo($dest, $mod); + + $dest = 'fedora/42/debug-modular-test/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f42']; + $mod .= genModule('fedora/42/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); + createRepo($dest, $mod); +} + +if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv'])) { + $dest = 'fedora/42/modular/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f42']; + $mod .= genModule('fedora/42/php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']); + createRepo($dest, $mod); + + $dest = 'fedora/42/debug-modular/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f42']; + $mod .= genModule('fedora/42/debug-php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + createRepo($dest, $mod); +} +if (in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { + $dest = 'fedora/42/modular-test/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f42']; + $mod .= genModule('fedora/42/test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + createRepo($dest, $mod); + + $dest = 'fedora/42/debug-modular-test/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f42']; + $mod .= genModule('fedora/42/debug-test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/42/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); + createRepo($dest, $mod); +} + if (in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $dest = 'enterprise/8/modular-test/x86_64'; @@ -785,6 +937,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) || i $mod .= genModule('enterprise/8/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $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); $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/composer2-test/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); @@ -803,6 +956,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) || i $mod .= genModule('enterprise/8/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $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); createRepo($dest, $mod); } if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) @@ -821,7 +975,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $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 .= 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']); + $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']); $deps = ['platform' => 'el8']; $mod .= genModule('enterprise/8/redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); @@ -852,6 +1007,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $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); $deps = ['platform' => 'el8']; $mod .= genModule('enterprise/8/debug-redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); @@ -876,6 +1032,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv']) || i $mod .= genModule('enterprise/8/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $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); $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/composer2-test/x86_64', $dest, '*.rpm', '2', 'aarch64', $deps, $template_comp); @@ -894,6 +1051,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv']) || i $mod .= genModule('enterprise/8/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $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); createRepo($dest, $mod); } if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv']) @@ -912,7 +1070,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $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 .= 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']); + $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']); $deps = ['platform' => 'el8']; $mod .= genModule('enterprise/8/redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); @@ -942,6 +1101,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $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); $deps = ['platform' => 'el8']; $mod .= genModule('enterprise/8/debug-redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); @@ -963,6 +1123,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $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); $deps = ['platform' => 'el9', 'php' => '']; $mod .= genModule('enterprise/9/composer2-test/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); @@ -979,6 +1140,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $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); createRepo($dest, $mod); } @@ -995,7 +1157,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) $mod .= genModule('enterprise/9/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $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 .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); + $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/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); @@ -1023,6 +1186,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $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-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); @@ -1047,7 +1211,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) $mod .= genModule('enterprise/9/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $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 .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); + $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/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); @@ -1075,6 +1240,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $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-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); @@ -1098,6 +1264,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $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); $deps = ['platform' => 'el9', 'php' => '']; $mod .= genModule('enterprise/9/composer2-test/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); @@ -1114,6 +1281,161 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $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); + createRepo($dest, $mod); +} + +if (in_array('el10', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { + $dest = 'enterprise/10/modular-test/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'el10']; + $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/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); + + $deps = ['platform' => 'el10', 'php' => '']; + $mod .= genModule('enterprise/10/composer2-test/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); + createRepo($dest, $mod); + + $dest = 'enterprise/10/debug-modular-test/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'el10']; + $mod .= genModule('enterprise/10/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/10/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/10/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $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); + createRepo($dest, $mod); +} + +if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv']) + || in_array('noarch', $_SERVER['argv'])) { + $dest = 'enterprise/10/modular/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'el10']; + $mod .= genModule('enterprise/10/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/10/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/10/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $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/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached); + $mod .= genDefaults('memcached', false, ['remi']); + + $mod .= genModule('enterprise/10/composer2/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); + $mod .= genDefaults('composer', false, ['2']); + createRepo($dest, $mod); +} +if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) { + $dest = 'enterprise/10/debug-modular/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'el10']; + $mod .= genModule('enterprise/10/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/10/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/10/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $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-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-memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached); + createRepo($dest, $mod); +} + +if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv']) + || in_array('noarch', $_SERVER['argv'])) { + $dest = 'enterprise/10/modular/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'el10']; + $mod .= genModule('enterprise/10/php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/10/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/10/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $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/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); + $mod .= genDefaults('memcached', false, ['remi']); + + $mod .= genModule('enterprise/10/composer2/x86_64', $dest, '*noarch.rpm', '2', 'aarch64', $deps, $template_comp); + $mod .= genDefaults('composer', false, ['2']); + createRepo($dest, $mod); +} +if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) { + $dest = 'enterprise/10/debug-modular/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'el10']; + $mod .= genModule('enterprise/10/debug-php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/10/debug-php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/10/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $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-memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); + createRepo($dest, $mod); +} + +if (in_array('el10', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { + $dest = 'enterprise/10/modular-test/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'el10']; + $mod .= genModule('enterprise/10/test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/10/test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/10/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $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); + + $deps = ['platform' => 'el10', 'php' => '']; + $mod .= genModule('enterprise/10/composer2-test/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); + createRepo($dest, $mod); + + $dest = 'enterprise/10/debug-modular-test/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'el10']; + $mod .= genModule('enterprise/10/debug-test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/10/debug-test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/10/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $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); createRepo($dest, $mod); } @@ -12,7 +12,7 @@ then elif [ "$nom" = "SRPMS" ] then dis=fedora - ver=40 + ver=42 old=8 dst=/data/rpms/SRPMS.remi else @@ -26,7 +26,10 @@ fi GPG_PATH=/home/remi/.gnupgrpm if [ "$dis" == "fedora" ]; then # Fedora - if [ "$ver" -ge 40 ] + if [ "$ver" -ge 42 ] + then echo "key 2025" + GPG_NAME="83833E4687A4AA03B6AC94F2061566968F1F4B2D" + elif [ "$ver" -ge 40 ] then echo "key 2024" GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4" elif [ "$ver" -ge 38 ] @@ -49,7 +52,10 @@ if [ "$dis" == "fedora" ]; then fi else # Enterprise - if [ "$ver" -ge 9 ] + if [ "$ver" -ge 10 ] + then echo "key 2024" + GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4" + elif [ "$ver" -ge 9 ] then echo "key 2021" GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947" elif [ "$ver" -ge 8 ] @@ -3,15 +3,19 @@ if [ "$2" = "" ]; then echo -e "\nusage: $0 [ options ] SRPM distro [ 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 SCL packages" - echo -e "\t--noscl | --base only build base packages\n" + echo -e "\t--nobase | --scl only build PHP SCL packages" + echo -e "\t--noscl | --base only build PHP base packages" + echo -e "\t--mock distro is a mock config name\n" + echo -e "Special distro: all, zts, memcached, im6, im7\n" exit 0 fi # Script options BUILD_BASE=1 BUILD_SCLS=1 +BUILD_MOCK=0 REDIS=0 REMOTE=0 @@ -19,14 +23,14 @@ REMOTE=0 if [ "$(uname -m)" = "x86_64" ]; then SUF=x QUEUE=mockx - REDISCLI="redis-cli" + REDISCLI="valkey-cli" else SUF=a QUEUE=mocka - REDISCLI="redis-cli -h remi" + REDISCLI="valkey-cli -h remi" fi -if [ "$1" == "--redis" ]; then +if [ "$1" == "--redis" -o "$1" == "--valkey" ]; then CHECK=$($REDISCLI ping) [ "$CHECK" = "PONG" ] || exit 1 REDIS=1 @@ -35,10 +39,19 @@ fi # Queue commands if [ "$1" == "--list" ]; then + a=$($REDISCLI bgsave) echo "-- x86_64 queue: $($REDISCLI scard mockx) tasks --" - $REDISCLI smembers mockx - echo "-- aarch64 queue: $($REDISCLI scard mocka) tasks --" - $REDISCLI smembers mocka + a=$($REDISCLI smembers mockx) + [ -n "$a" ] && $REDISCLI smembers mockx | \ + sed -e 's/^.*-r / /;s/rebuild/\t/;s:/.*/::' | sort | head -n 25 || \ + ps -ef | grep mock/mock | grep -v grep + + echo -e "\n-- aarch64 queue: $($REDISCLI scard mocka) tasks --" + a=$($REDISCLI smembers mocka) + [ -n "$a" ] && $REDISCLI smembers mocka | \ + sed -e 's/^.*-r / /;s/rebuild/\t/;s:/.*/::'| sort || \ + ps -ef | ssh remi@ampere 'ps -ef | grep mock/mock | grep -v grep' + exit 0 elif [ "$1" == "--clean" ]; then $REDISCLI del mockx @@ -52,6 +65,11 @@ if [ "$1" == "--nobase" -o "$1" == "--scl" ]; then elif [ "$1" == "--noscl" -o "$1" == "--base" ]; then BUILD_SCLS=0 shift +elif [ "$1" == "--mock" ]; then + BUILD_BASE=0 + BUILD_SCLS=0 + BUILD_MOCK=1 + shift fi SRPM=$1 @@ -73,13 +91,13 @@ else fi case $DIST in - *x) + *x|*xm|*xr|*xr62|*xr72) if [ $SUF != x ]; then echo "Not an x86_64 builder" exit 1 fi ;; - *a) + *a|*am|*ar|*ar62|*ar72) if [ $SUF != a ]; then if [ $REDIS -ge 1 ]; then REMOTE=1 @@ -89,18 +107,14 @@ case $DIST in fi fi ;; - *) - DIST=$DIST$SUF - ;; esac # SRPM abolute path +mockref=/home/rpmbuild/SPECS/remirepo/tools/mock +mocketc=$mockref +srpmdir=/home/rpmbuild/site/rpms/SRPMS case $DIST in - *x) - mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock - srpmdir=/home/rpmbuild/site/rpms/SRPMS - ;; - *a) + *a|*am) mocketc=/home/remi/mock srpmdir=/home/remi/SRPMS ;; @@ -131,32 +145,87 @@ fi # PHP version matrix echo mockit $SRPM $DIST $MIN $MAX $@ case $DIST in - fc39x|fc39a|fc40x|fc40a|fc41x|fc41a|el9x|el9a) - LST="82 81 74 80 83" + fc42x|fc42a|fc40x|fc40a|fc41x|fc41a|el9x|el9a|el10x|el10a) + LST="74 80 81 82 83 84" SCL="74 80 81 82 83 84" ;; el8a) - LST="72 73 74 80 81 82 83" + LST="72 73 74 80 81 82 83 84" SCL="72 73 74 80 81 82 83 84" ;; el8x) - LST="72 73 74 80 81 82 83" + LST="72 73 74 80 81 82 83 84" SCL="56 70 71 72 73 74 80 81 82 83 84" ;; - allx) + all) + if [ $REDIS -ge 1 ]; then + for i in fc40x fc41x fc42x el8x el9x el10x fc40a fc41a fc42a el8a el9a el10a + do + [ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@ + [ $BUILD_SCLS -ge 1 ] && $0 --valkey --scl $SRPM $i $MIN $MAX $@ + done + else + echo Not supported for direct build + fi + ;; + zts) + if [ $REDIS -ge 1 ]; then + [ $MAX -gt 83 ] && MAX=83 + for i in fc40x el8x el9x + do + [ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@ + done + else + echo Not supported for direct build + fi + ;; + memcached) + if [ $REDIS -ge 1 ]; then + for i in fc40xm fc41x fc42x el8x el9xm el10xm fc40am fc41a fc42a el8a el9am el10am + do + $0 --valkey --mock $SRPM $i $MIN $MAX $@ + done + else + echo Not supported for direct build + fi + ;; + im6) if [ $REDIS -ge 1 ]; then - for i in fc39x fc40x fc41x el8x el9x fc39a fc40a fc41a el8a el9a + for i in fc40x el8xr el9x fc40a el8ar el9a do - [ $BUILD_BASE -ge 1 ] && $0 --redis --base $SRPM $i $MIN $MAX $@ - [ $BUILD_SCLS -ge 1 ] && $0 --redis --scl $SRPM $i $MIN $MAX $@ + $0 --valkey --mock $SRPM $i $MIN $MAX $@ + done + else + echo Not supported for direct build + fi + ;; + im7) + if [ $REDIS -ge 1 ]; then + for i in fc40x fc41x fc42x el8xr el9x el10x fc40a fc41a fc42a el8ar el9a el10a + do + $0 --valkey --mock $SRPM $i $MIN $MAX $@ + done + else + echo Not supported for direct build + fi + ;; + r*) + if [ $REDIS -ge 1 ]; then + for i in fc40x el8x el9x fc40a el8a el9a + do + $0 --valkey --mock $SRPM ${i}${DIST} $MIN $MAX $@ done else echo Not supported for direct build fi ;; *) - echo Unkown DIST $DIST - exit 1 + if [ $BUILD_MOCK -eq 0 -o ! -f ${mockref}/${DIST}.cfg ]; then + [ $BUILD_MOCK -eq 0 ] && echo "BUILD_MOCK=0" + [ ! -f ${mocketc}/${DIST}.cfg ] && echo "${mockref}/${DIST}.cfg missing" + echo Unkown DIST $DIST + exit 1 + fi ;; esac @@ -188,6 +257,11 @@ do fi fi done +# Build using mock config +if [ $BUILD_MOCK -ge 1 ]; then + CMD="mock -q --configdir=$mocketc -r ${DIST} rebuild $SRPM $@" + $REDISCLI sadd $QUEUE "$CMD" +fi if [ $REDIS -ge 1 ]; then echo "Queue size: " $($REDISCLI scard $QUEUE) @@ -3,10 +3,10 @@ # ARCH detection and check if [ "$(uname -m)" = "x86_64" ]; then QUEUE=mockx - REDISCLI="redis-cli" + REDISCLI="valkey-cli" else QUEUE=mocka - REDISCLI="redis-cli -h remi" + REDISCLI="valkey-cli -h remi" fi CHECK=$($REDISCLI ping) @@ -24,7 +24,7 @@ sed --regexp-extended \ --expression "/^Version:/s/[0-9.]+$/$1/" \ --expression "/github_version/s/[0-9.]+$/$1/" \ --expression "/upstream_version/s/[0-9.]+$/$1/" \ - --expression "/(github|gh)_commit/s/[0-9a-f]{40}$/$2/" \ + --expression "/(github_|gh_| )commit /s/[0-9a-f]{40}$/$2/" \ --expression "/(github|gh)_date/s/[0-9\-]{10}$/$date/" \ --expression '/^Release:/s/[0-9.]+/1/' \ --expression "s/%changelog/%changelog\n* $rpmdate $vendor - $1-1\n- update to $1\n/" \ |