diff options
author | Remi Collet <remi@remirepo.net> | 2025-02-13 09:11:24 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2025-02-13 09:11:24 +0100 |
commit | ba1bcfbc4e35ac4f394d45b7c1f3f961b91e747f (patch) | |
tree | 8176f61f6736ef1348557cb481a98566731f7bc4 | |
parent | 2494a23b95cf1908ad2b30e5448bb49a4f713d7c (diff) |
Drop F39
-rw-r--r-- | buildfct | 82 | ||||
-rwxr-xr-x | getmock | 57 | ||||
-rwxr-xr-x | mkallrepo | 5 | ||||
-rwxr-xr-x | mkmodular | 3 | ||||
-rwxr-xr-x | mockit | 12 |
5 files changed, 69 insertions, 90 deletions
@@ -57,6 +57,20 @@ alias mockfc41xscl82=" mock --configdir=$mocketc -r fc41xscl82 alias mockfc41xscl83=" mock --configdir=$mocketc -r fc41xscl83 rebuild " alias mockfc41xscl84=" mock --configdir=$mocketc -r fc41xscl84 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 mockel8x=" mock --configdir=$mocketc -r el8x rebuild " alias mockel8xr=" mock --configdir=$mocketc -r el8xr rebuild " alias mockel8xp=" mock --configdir=$mocketc -r el8xp rebuild " @@ -168,13 +182,13 @@ if [ -f "$1" ]; then date +%X pids="" echo -n "" - (mock $quiet --configdir=$mocketc -r fc41x rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc40 Error !")& + (mock $quiet --configdir=$mocketc -r fc42x rebuild "$@" && echo "$(date +%X) (84) fc42 Ok." || echo "fc42 Error !")& pids="$pids $!" echo -n "" - (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (83) fc40 Ok." || echo "fc40 Error !")& + (mock $quiet --configdir=$mocketc -r fc41x rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc41 Error !")& pids="$pids $!" echo -n "" - (mock $quiet --configdir=$mocketc -r fc39x rebuild "$@" && echo "$(date +%X) (82) fc39 Ok." || echo "fc39 Error !")& + (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (83) fc40 Ok." || echo "fc40 Error !")& pids="$pids $!" echo -n "" (mock $quiet --configdir=$mocketc -r el8n81 rebuild "$@" && echo "$(date +%X) (81) el8 Ok." || echo "el8 Error !")& @@ -204,13 +218,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 !")& @@ -240,6 +254,9 @@ 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 "" @@ -334,7 +351,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 39 40 + for i in 41 40 do echo -n "$(date +%X) 74 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !" @@ -360,7 +377,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 39 40 + for i in 41 40 do echo -n "$(date +%X) scl84 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl84 rebuild "$@" && echo " Ok." || echo " Error !" @@ -386,7 +403,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 40 39 + for i in 41 40 do echo -n "$(date +%X) scl83 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !" @@ -412,7 +429,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 39 40 + for i in 41 40 do echo -n "$(date +%X) scl82 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !" @@ -438,7 +455,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 40 39 + for i in 41 40 do echo -n "$(date +%X) scl81 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !" @@ -464,8 +481,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 " @@ -486,8 +501,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 " @@ -508,8 +521,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 " @@ -530,8 +541,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 " @@ -552,7 +561,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 40 39 + for i in 41 40 do echo -n "$(date +%X) 84 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x84 rebuild "$@" && echo " Ok." || echo " Error !" @@ -578,7 +587,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 40 39 + for i in 41 40 do echo -n "$(date +%X) 83 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !" @@ -615,27 +624,6 @@ else fi } -# Build All distribution / version / 64bits for remi/remi-php83 -mock83fc() -{ -quiet="" -if [ "$1" = "-q" ]; then - quiet="--quiet" - shift -fi - -if [ -f "$1" ]; then - for i in 39 - do - echo -n "$(date +%X) 83 fc$i " - mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !" - done - date +%X -else - echo "file not found '$1'" -fi -} - # Build All distribution / version / 64bits for remi/remi-php82 mock82x() { @@ -646,7 +634,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 40 39 + for i in 41 40 do echo -n "$(date +%X) 82 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !" @@ -672,7 +660,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 40 39 + for i in 41 40 do echo -n "$(date +%X) 81 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !" @@ -698,7 +686,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 39 40 + for i in 41 40 do echo -n "$(date +%X) 80 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !" @@ -724,7 +712,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 39 40 + for i in 41 40 do echo -n "$(date +%X) scl80 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !" @@ -750,7 +738,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 40 39 + for i in 41 40 do echo -n "$(date +%X) scl74 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !" @@ -339,6 +339,13 @@ do cp $i priv/fc41.x86_64 && echo + $i copied priv FC41 fi ;; + remi-crypto*fc42*) + if [ -f priv/fc42.x86_64/$j ]; then + echo " " $i already there + else + cp $i priv/fc42.x86_64 && echo + $i copied priv FC42 + fi + ;; remi-crypto*fc40*) if [ -f priv/fc40.x86_64/$j ]; then echo " " $i already there @@ -506,8 +513,6 @@ 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 fc40x74 $opt '*7.4*' getOneMock fc40a74 $opt '*7.4*' getOneMock fc41x74 $opt '*7.4*' @@ -522,8 +527,6 @@ elif [ $1 = all74 ]; then elif [ $1 = all80 ]; then [ $opt = remi ] && opt=php80 [ $opt = test ] && opt=test80 - getOneMock fc39x80 $opt '*8.0*' - getOneMock fc39a80 $opt '*8.0*' getOneMock fc40x80 $opt '*8.0*' getOneMock fc40a80 $opt '*8.0*' getOneMock fc41x80 $opt '*8.0*' @@ -538,8 +541,6 @@ elif [ $1 = all80 ]; then elif [ $1 = all81 ]; then [ $opt = remi ] && opt=php81 [ $opt = test ] && opt=test81 - getOneMock fc39x81 $opt '*8.1*' - getOneMock fc39a81 $opt '*8.1*' getOneMock fc40x81 $opt '*8.1*' getOneMock fc40a81 $opt '*8.1*' getOneMock fc41x81 $opt '*8.1*' @@ -554,8 +555,6 @@ elif [ $1 = all81 ]; then elif [ $1 = all82 ]; then [ $opt = remi ] && opt=php82 [ $opt = test ] && opt=test82 - getOneMock fc39x82 $opt '*8.2*' - getOneMock fc39a82 $opt '*8.2*' getOneMock fc40x82 $opt '*8.2*' getOneMock fc40a82 $opt '*8.2*' getOneMock fc41x82 $opt '*8.2*' @@ -570,8 +569,6 @@ elif [ $1 = all82 ]; then elif [ $1 = all83 ]; then [ $opt = remi ] && opt=php83 [ $opt = test ] && opt=test83 - getOneMock fc39x83 $opt '*8.3*' - getOneMock fc39a83 $opt '*8.3*' getOneMock fc40x83 $opt '*8.3*' getOneMock fc40a83 $opt '*8.3*' getOneMock fc41x83 $opt '*8.3*' @@ -586,8 +583,6 @@ elif [ $1 = all83 ]; then elif [ $1 = all84 ]; then [ $opt = remi ] && opt=php84 [ $opt = test ] && opt=test84 - getOneMock fc39x84 $opt '*8.4*' - getOneMock fc39a84 $opt '*8.4*' getOneMock fc40x84 $opt '*8.4*' getOneMock fc40a84 $opt '*8.4*' getOneMock fc41x84 $opt '*8.4*' @@ -601,8 +596,6 @@ elif [ $1 = all84 ]; then elif [ $1 = allr60 ]; then opt=redis60 - getOneMock fc39x $opt '*6.0*' - getOneMock fc39a $opt '*6.0*' getOneMock fc40x $opt '*6.0*' getOneMock fc40a $opt '*6.0*' getOneMock el8x $opt '*6.0*' @@ -612,8 +605,6 @@ elif [ $1 = allr60 ]; then elif [ $1 = allr62 ]; then opt=redis62 - getOneMock fc39x $opt '*6.2*' - getOneMock fc39a $opt '*6.2*' getOneMock fc40x $opt '*6.2*' getOneMock fc40a $opt '*6.2*' getOneMock el8x $opt '*6.2*' @@ -623,8 +614,6 @@ elif [ $1 = allr62 ]; then elif [ $1 = allr70 ]; then opt=redis70 - getOneMock fc39x $opt '*7.0*' - getOneMock fc39a $opt '*7.0*' getOneMock fc40x $opt '*7.0*' getOneMock fc40a $opt '*7.0*' getOneMock el8x $opt '*7.0*' @@ -634,8 +623,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*' @@ -650,8 +637,6 @@ elif [ $1 = allm ]; then getOneMock fc41x $opt '*1.6*' getOneMock fc41a $opt '*1.6*' opt=memcached - getOneMock fc39x $opt '*1.6*' - getOneMock fc39a $opt '*1.6*' getOneMock fc40x $opt '*1.6*' getOneMock fc40a $opt '*1.6*' getOneMock el9x $opt '*1.6*' @@ -660,23 +645,23 @@ elif [ $1 = allm ]; then getOneMock el10a $opt '*1.6*' elif [ $1 = allx ]; then - for i in 39 40 41 + for i in 8 9 10 do - getOneMock fc${i}x $opt + (getOneMock el${i}x $opt) done - for i in 8 9 10 + for i in 40 41 42 do - getOneMock el${i}x $opt + (getOneMock fc${i}x $opt) done elif [ $1 = alla ]; then - for i in 39 40 41 + for i in 8 9 10 do - getOneMock fc${i}a $opt + (getOneMock el${i}a $opt) done - for i in 8 9 10 + for i in 40 41 42 do - getOneMock el${i}a $opt + (getOneMock fc${i}a $opt) done elif [ $1 = scl56 ]; then @@ -698,42 +683,42 @@ elif [ $1 = scl71 ]; then done elif [ $1 = scl84 ]; then - for dis in fc39 fc40 fc41 el8 el9 el10 + for dis in fc40 fc41 el8 el9 el10 do getOneMock scl84${dis}x $opt getOneMock scl84${dis}a $opt done elif [ $1 = scl83 ]; then - for dis in fc39 fc40 fc41 el8 el9 el10 + for dis in fc40 fc41 el8 el9 el10 do getOneMock scl83${dis}x $opt getOneMock scl83${dis}a $opt done elif [ $1 = scl82 ]; then - for dis in fc39 fc40 fc41 el8 el9 el10 + for dis in fc40 fc41 el8 el9 el10 do getOneMock scl82${dis}x $opt getOneMock scl82${dis}a $opt done elif [ $1 = scl81 ]; then - for dis in fc39 fc40 fc41 el8 el9 el10 + for dis in fc40 fc41 el8 el9 el10 do getOneMock scl81${dis}x $opt getOneMock scl81${dis}a $opt done elif [ $1 = scl80 ]; then - for dis in fc39 fc40 fc41 el8 el9 el10 + for dis in fc40 fc41 el8 el9 el10 do getOneMock scl80${dis}x $opt getOneMock scl80${dis}a $opt done elif [ $1 = scl74 ]; then - for dis in fc39 fc40 fc41 el8 el9 el10 + for dis in fc40 fc41 el8 el9 el10 do getOneMock scl74${dis}x $opt getOneMock scl74${dis}a $opt @@ -11,7 +11,7 @@ TMPSIG2025=$(mktemp -t XXXXXXXX.2025) cd /home/rpmbuild/site/rpms -for dep in fedora/{39,40,41}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} +for dep in fedora/{40,41,42}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} do [[ $dep =~ /modular ]] && continue [[ $dep =~ /debug-modular ]] && continue @@ -57,6 +57,7 @@ if [ -s $TMPSIG ]; then grep el10 $TMPSIG >> $TMPSIG2024 # 2025 grep src.rpm $TMPSIG > $TMPSIG2025 + grep fc42 $TMPSIG >> $TMPSIG2025 if [ -s $TMPSIG2025 ]; then echo "== Signature des $(cat $TMPSIG2025 | wc -l) nouveaux RPM (2025) ==" @@ -118,7 +119,7 @@ then echo "== Création des liens (noarch) ==" else echo "Rien à lier." fi -for dep in SRPMS fedora/{39,40,41}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} +for dep in SRPMS fedora/{40,41,42}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} do [[ $dep =~ /modular ]] && continue [[ $dep =~ /debug-modular ]] && continue @@ -391,6 +391,7 @@ exec("gpg --armor --detach-sign --default-key \"$GPG_NAME\" --homedir \"$GPG_PAT chdir($old); } +/* if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array('f39x', $_SERVER['argv'])) { $dest = 'fedora/39/modular/x86_64'; echo "Populate $dest\n"; @@ -534,7 +535,7 @@ if (in_array('f39', $_SERVER['argv']) || in_array('f39a', $_SERVER['argv']) || i $mod .= genModule('fedora/39/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); createRepo($dest, $mod); } - +*/ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array('f40x', $_SERVER['argv'])) { $dest = 'fedora/40/modular/x86_64'; echo "Populate $dest\n"; @@ -144,7 +144,11 @@ fi # PHP version matrix echo mockit $SRPM $DIST $MIN $MAX $@ case $DIST in - fc39x|fc39a|fc40x|fc40a|fc41x|fc41a|el9x|el9a|el10x|el10a) + fc42x|fc42a) + LST="" + SCL="" + ;; + fc40x|fc40a|fc41x|fc41a|el9x|el9a|el10x|el10a) LST="82 81 74 80 83 84" SCL="74 80 81 82 83 84" ;; @@ -158,7 +162,7 @@ case $DIST in ;; all) if [ $REDIS -ge 1 ]; then - for i in fc39x fc40x fc41x el8x el9x el10x fc39a fc40a fc41a el8a el9a el10a + for i in fc40x fc41x fc42x el8x el9x el10x fc40a fc41a fc42a el8a el9a el10a do [ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@ [ $BUILD_SCLS -ge 1 ] && $0 --valkey --scl $SRPM $i $MIN $MAX $@ @@ -170,7 +174,7 @@ case $DIST in zts) if [ $REDIS -ge 1 ]; then [ $MAX -gt 83 ] && MAX=83 - for i in fc39x fc40x el8x el9x + for i in fc40x el8x el9x do [ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@ done @@ -180,7 +184,7 @@ case $DIST in ;; memcached) if [ $REDIS -ge 1 ]; then - for i in fc39xm fc40xm fc41x el8x el9xm el10xm fc39am fc40am fc41a el8a el9am el10am + for i in fc40xm fc41x fc42x el8x el9xm el10xm fc40am fc41a fc42a el8a el9am el10am do $0 --valkey --mock $SRPM $i $MIN $MAX $@ done |