diff options
| -rw-r--r-- | buildfct | 59 | ||||
| -rwxr-xr-x | getmock | 51 | ||||
| -rwxr-xr-x | mkallrepo | 7 | ||||
| -rwxr-xr-x | mkmodular | 157 | ||||
| -rwxr-xr-x | mockit | 26 | ||||
| -rwxr-xr-x | pkgup | 2 |
6 files changed, 36 insertions, 266 deletions
@@ -5,28 +5,6 @@ alias rhpkg='echo NO PLEASE, use fedpkg' mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock -alias mockfc41x=" mock --configdir=$mocketc -r fc41x rebuild " -alias mockfc41n84=" mock --configdir=$mocketc -r fc41n84 rebuild " -alias mockfc41x74=" mock --configdir=$mocketc -r fc41x74 rebuild " -alias mockfc41x80=" mock --configdir=$mocketc -r fc41x80 rebuild " -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 mockfc41x85=" mock --configdir=$mocketc -r fc41x85 rebuild " -alias mockfc41xscl74=" mock --configdir=$mocketc -r fc41xscl74 rebuild " -alias mockfc41xscl80=" mock --configdir=$mocketc -r fc41xscl80 rebuild " -alias mockfc41xscl81=" mock --configdir=$mocketc -r fc41xscl81 rebuild " -alias mockfc41xscl82=" mock --configdir=$mocketc -r fc41xscl82 rebuild " -alias mockfc41xscl83=" mock --configdir=$mocketc -r fc41xscl83 rebuild " -alias mockfc41xscl84=" mock --configdir=$mocketc -r fc41xscl84 rebuild " -alias mockfc41xscl85=" mock --configdir=$mocketc -r fc41xscl85 rebuild " -alias mockfc41xr80=" mock --configdir=$mocketc -r fc41xr80 rebuild " -alias mockfc41xr82=" mock --configdir=$mocketc -r fc41xr82 rebuild " -alias mockfc41xr84=" mock --configdir=$mocketc -r fc41xr84 rebuild " -alias mockfc41xv81=" mock --configdir=$mocketc -r fc41xv81 rebuild " -alias mockfc41xv90=" mock --configdir=$mocketc -r fc41xv90 rebuild " - alias mockfc42x=" mock --configdir=$mocketc -r fc42x rebuild " alias mockfc42x74=" mock --configdir=$mocketc -r fc42x74 rebuild " alias mockfc42x80=" mock --configdir=$mocketc -r fc42x80 rebuild " @@ -217,9 +195,6 @@ if [ -f "$1" ]; then (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 "fc41 Error !")& - pids="$pids $!" - echo -n "" (mock $quiet --configdir=$mocketc -r el8n82 rebuild "$@" && echo "$(date +%X) (81) el8 Ok." || echo "el8 Error !")& pids="$pids $!" echo -n "" @@ -253,9 +228,6 @@ if [ -f "$1" ]; then (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 "fc41 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 "" @@ -289,9 +261,6 @@ if [ -f "$1" ]; then (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 fc41n84 rebuild "$@" && echo "$(date +%X) (83) fc41 Ok." || echo "fc41 Error !")& - pids="$pids $!" - echo -n "" (mock $quiet --configdir=$mocketc -r el8n84 rebuild "$@" && echo "$(date +%X) (81) el8 Ok." || echo "el8 Error !")& pids="$pids $!" echo -n "" @@ -380,7 +349,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 42 43 + for i in 42 43 do echo -n "$(date +%X) 74 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !" @@ -406,7 +375,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 43 42 41 + for i in 43 42 do echo -n "$(date +%X) scl85 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl85 rebuild "$@" && echo " Ok." || echo " Error !" @@ -432,7 +401,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 43 42 41 + for i in 43 42 do echo -n "$(date +%X) scl84 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl84 rebuild "$@" && echo " Ok." || echo " Error !" @@ -458,7 +427,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 43 41 42 + for i in 43 42 do echo -n "$(date +%X) scl83 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !" @@ -484,7 +453,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 43 41 42 + for i in 43 42 do echo -n "$(date +%X) scl82 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !" @@ -510,7 +479,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 43 42 41 + for i in 43 42 do echo -n "$(date +%X) scl81 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !" @@ -616,7 +585,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 42 43 + for i in 42 43 do echo -n "$(date +%X) 84 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x85 rebuild "$@" && echo " Ok." || echo " Error !" @@ -642,7 +611,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 43 41 42 + for i in 43 42 do echo -n "$(date +%X) 84 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x84 rebuild "$@" && echo " Ok." || echo " Error !" @@ -668,7 +637,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 42 41 43 + for i in 42 43 do echo -n "$(date +%X) 83 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !" @@ -715,7 +684,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 42 43 + for i in 42 43 do echo -n "$(date +%X) 82 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !" @@ -741,7 +710,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 41 42 43 + for i in 42 43 do echo -n "$(date +%X) 81 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !" @@ -767,7 +736,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 42 41 43 + for i in 42 43 do echo -n "$(date +%X) 80 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !" @@ -793,7 +762,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 43 41 42 + for i in 43 42 do echo -n "$(date +%X) scl80 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !" @@ -819,7 +788,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 43 41 42 + for i in 43 42 do echo -n "$(date +%X) scl74 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !" @@ -368,13 +368,6 @@ do 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 - else - 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 @@ -553,8 +546,6 @@ elif [ $1 = all74 ]; then getOneMock fc43a74 $opt '*module_php.7.4*' getOneMock fc42x74 $opt '*module_php.7.4*' getOneMock fc42a74 $opt '*module_php.7.4*' - getOneMock fc41x74 $opt '*module_php.7.4*' - getOneMock fc41a74 $opt '*module_php.7.4*' getOneMock el8x74 $opt '*module_php.7.4*' getOneMock el8a74 $opt '*module_php.7.4*' getOneMock el9x74 $opt '*module_php.7.4*' @@ -569,8 +560,6 @@ elif [ $1 = all80 ]; then getOneMock fc43a80 $opt '*module_php.8.0*' getOneMock fc42x80 $opt '*module_php.8.0*' getOneMock fc42a80 $opt '*module_php.8.0*' - getOneMock fc41x80 $opt '*module_php.8.0*' - getOneMock fc41a80 $opt '*module_php.8.0*' getOneMock el8x80 $opt '*module_php.8.0*' getOneMock el8a80 $opt '*module_php.8.0*' getOneMock el9x80 $opt '*module_php.8.0*' @@ -585,8 +574,6 @@ elif [ $1 = all81 ]; then getOneMock fc43a81 $opt '*module_php.8.1*' getOneMock fc42x81 $opt '*module_php.8.1*' getOneMock fc42a81 $opt '*module_php.8.1*' - getOneMock fc41x81 $opt '*module_php.8.1*' - getOneMock fc41a81 $opt '*module_php.8.1*' getOneMock el8x81 $opt '*module_php.8.1*' getOneMock el8a81 $opt '*module_php.8.1*' getOneMock el9x81 $opt '*module_php.8.1*' @@ -601,8 +588,6 @@ elif [ $1 = all82 ]; then getOneMock fc43a82 $opt '*module_php.8.2*' getOneMock fc42x82 $opt '*module_php.8.2*' getOneMock fc42a82 $opt '*module_php.8.2*' - getOneMock fc41x82 $opt '*module_php.8.2*' - getOneMock fc41a82 $opt '*module_php.8.2*' getOneMock el8x82 $opt '*module_php.8.2*' getOneMock el8a82 $opt '*module_php.8.2*' getOneMock el9x82 $opt '*module_php.8.2*' @@ -617,8 +602,6 @@ elif [ $1 = all83 ]; then getOneMock fc43a83 $opt '*module_php.8.3*' getOneMock fc42x83 $opt '*module_php.8.3*' getOneMock fc42a83 $opt '*module_php.8.3*' - getOneMock fc41x83 $opt '*module_php.8.3*' - getOneMock fc41a83 $opt '*module_php.8.3*' getOneMock el8x83 $opt '*module_php.8.3*' getOneMock el8a83 $opt '*module_php.8.3*' getOneMock el9x83 $opt '*module_php.8.3*' @@ -633,8 +616,6 @@ elif [ $1 = all84 ]; then getOneMock fc43a84 $opt '*module_php.8.4*' getOneMock fc42x84 $opt '*module_php.8.4*' getOneMock fc42a84 $opt '*module_php.8.4*' - getOneMock fc41x84 $opt '*module_php.8.4*' - getOneMock fc41a84 $opt '*module_php.8.4*' getOneMock el8x84 $opt '*module_php.8.4*' getOneMock el8a84 $opt '*module_php.8.4*' getOneMock el9x84 $opt '*module_php.8.4*' @@ -649,8 +630,6 @@ elif [ $1 = all85 ]; then getOneMock fc43a85 $opt '*module_php.8.5*' getOneMock fc42x85 $opt '*module_php.8.5*' getOneMock fc42a85 $opt '*module_php.8.5*' - getOneMock fc41x85 $opt '*module_php.8.5*' - getOneMock fc41a85 $opt '*module_php.8.5*' getOneMock el8x85 $opt '*module_php.8.5*' getOneMock el8a85 $opt '*module_php.8.5*' getOneMock el9x85 $opt '*module_php.8.5*' @@ -690,8 +669,6 @@ elif [ $1 = allr72 ]; then elif [ $1 = allv90 ]; then opt=valkey90 - getOneMock fc41x $opt '*module_valkey.9.0*' - getOneMock fc41a $opt '*module_valkey.9.0*' getOneMock fc42x $opt '*module_valkey.9.0*' getOneMock fc42a $opt '*module_valkey.9.0*' getOneMock fc43x $opt '*module_valkey.9.0*' @@ -705,8 +682,6 @@ elif [ $1 = allv90 ]; then elif [ $1 = allv81 ]; then opt=valkey81 - getOneMock fc41x $opt '*module_valkey.8.1*' - getOneMock fc41a $opt '*module_valkey.8.1*' getOneMock fc42x $opt '*module_valkey.8.1*' getOneMock fc42a $opt '*module_valkey.8.1*' getOneMock fc43x $opt '*module_valkey.8.1*' @@ -733,8 +708,6 @@ elif [ $1 = allr86 ]; then elif [ $1 = allr84 ]; then opt=redis84 - getOneMock fc41x $opt '*module_redis.8.4*' - getOneMock fc41a $opt '*module_redis.8.4*' getOneMock fc42x $opt '*module_redis.8.4*' getOneMock fc42a $opt '*module_redis.8.4*' getOneMock fc43x $opt '*module_redis.8.4*' @@ -748,8 +721,6 @@ elif [ $1 = allr84 ]; then elif [ $1 = allr82 ]; then opt=redis82 - getOneMock fc41x $opt '*module_redis.8.2*' - getOneMock fc41a $opt '*module_redis.8.2*' getOneMock fc42x $opt '*module_redis.8.2*' getOneMock fc42a $opt '*module_redis.8.2*' getOneMock fc43x $opt '*module_redis.8.2*' @@ -763,8 +734,6 @@ elif [ $1 = allr82 ]; then elif [ $1 = allr80 ]; then opt=redis80 - getOneMock fc41x $opt '*module_redis.8.0*' - getOneMock fc41a $opt '*module_redis.8.0*' getOneMock fc42x $opt '*module_redis.8.0*' getOneMock fc42a $opt '*module_redis.8.0*' getOneMock fc43x $opt '*module_redis.8.0*' @@ -780,8 +749,6 @@ 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 @@ -795,7 +762,7 @@ elif [ $1 = allx ]; then do (getOneMock el${i}x $opt) done - for i in 41 42 43 + for i in 42 43 do (getOneMock fc${i}x $opt) done @@ -805,7 +772,7 @@ elif [ $1 = alla ]; then do (getOneMock el${i}a $opt) done - for i in 41 42 43 + for i in 42 43 do (getOneMock fc${i}a $opt) done @@ -829,49 +796,49 @@ elif [ $1 = scl71 ]; then done elif [ $1 = scl85 ]; then - for dis in fc43 fc41 fc42 el8 el9 el10 + for dis in fc43 fc42 el8 el9 el10 do getOneMock scl85${dis}x $opt getOneMock scl85${dis}a $opt done elif [ $1 = scl84 ]; then - for dis in fc43 fc41 fc42 el8 el9 el10 + for dis in fc43 fc42 el8 el9 el10 do getOneMock scl84${dis}x $opt getOneMock scl84${dis}a $opt done elif [ $1 = scl83 ]; then - for dis in fc43 fc41 fc42 el8 el9 el10 + for dis in fc43 fc42 el8 el9 el10 do getOneMock scl83${dis}x $opt getOneMock scl83${dis}a $opt done elif [ $1 = scl82 ]; then - for dis in fc43 fc41 fc42 el8 el9 el10 + for dis in fc43 fc42 el8 el9 el10 do getOneMock scl82${dis}x $opt getOneMock scl82${dis}a $opt done elif [ $1 = scl81 ]; then - for dis in fc43 fc41 fc42 el8 el9 el10 + for dis in fc43 fc42 el8 el9 el10 do getOneMock scl81${dis}x $opt getOneMock scl81${dis}a $opt done elif [ $1 = scl80 ]; then - for dis in fc43 fc42 fc41 el8 el9 el10 + for dis in fc43 fc42 el8 el9 el10 do getOneMock scl80${dis}x $opt getOneMock scl80${dis}a $opt done elif [ $1 = scl74 ]; then - for dis in fc43 fc42 fc41 el8 el9 el10 + for dis in fc43 fc42 el8 el9 el10 do getOneMock scl74${dis}x $opt getOneMock scl74${dis}a $opt @@ -12,7 +12,7 @@ TMPSIG2026=$(mktemp -t XXXXXXXX.2026) cd /home/rpmbuild/site/rpms -for dep in fedora/{41,42,43}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} +for dep in fedora/{42,43}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} do [[ $dep =~ /modular ]] && continue [[ $dep =~ /debug-modular ]] && continue @@ -53,8 +53,7 @@ if [ -s $TMPSIG ]; then # 2023 grep fc39 $TMPSIG > $TMPSIG2023 # 2024 - grep fc41 $TMPSIG > $TMPSIG2024 - grep el10 $TMPSIG >> $TMPSIG2024 + grep el10 $TMPSIG > $TMPSIG2024 # 2025 grep fc42 $TMPSIG > $TMPSIG2025 grep fc43 $TMPSIG >> $TMPSIG2025 @@ -128,7 +127,7 @@ then echo "== Création des liens (noarch) ==" else echo "Rien à lier." fi -for dep in SRPMS fedora/{41,42,43}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} +for dep in SRPMS fedora/{42,43}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64} do [[ $dep =~ /modular ]] && continue [[ $dep =~ /debug-modular ]] && continue @@ -436,163 +436,6 @@ exec("gpg --armor --detach-sign --default-key \"$GPG_NAME\" --homedir \"$GPG_PAT chdir($old); } -// -------------- 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"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f41']; - $mod .= genModule('fedora/41/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/41/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $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 .= genModule('fedora/41/php84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/41/php85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); - $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4', 'remi-8.5']); - - $mod .= genModule('fedora/41/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/41/redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/41/redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); - - $mod .= genModule('fedora/41/valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey); - $mod .= genModule('fedora/41/valkey90/x86_64',$dest,'*.rpm', '9.0', 'x86_64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); - createRepo($dest, $mod); - - $dest = 'fedora/41/debug-modular/x86_64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f41']; - $mod .= genModule('fedora/41/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/41/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $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); - $mod .= genModule('fedora/41/debug-php85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/41/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/41/debug-redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/41/debug-redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); - $mod .= genModule('fedora/41/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey); - $mod .= genModule('fedora/41/debug-valkey90/x86_64',$dest,'*.rpm', '9.0', 'x86_64', $deps, $template_valkey); - createRepo($dest, $mod); -} -if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { - $dest = 'fedora/41/modular-test/x86_64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f41']; - $mod .= genModule('fedora/41/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/41/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $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); - $mod .= genModule('fedora/41/test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); - createRepo($dest, $mod); - - $dest = 'fedora/41/debug-modular-test/x86_64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f41']; - $mod .= genModule('fedora/41/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); - $mod .= genModule('fedora/41/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); - $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); - $mod .= genModule('fedora/41/debug-test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); - createRepo($dest, $mod); -} - -if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv'])) { - $dest = 'fedora/41/modular/aarch64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f41']; - $mod .= genModule('fedora/41/php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/41/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); - $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 .= genModule('fedora/41/php84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/41/php85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); - $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4', 'remi-8.5']); - - $mod .= genModule('fedora/41/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); - $mod .= genModule('fedora/41/redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); - $mod .= genModule('fedora/41/redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); - - $mod .= genModule('fedora/41/valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); - $mod .= genModule('fedora/41/valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); - createRepo($dest, $mod); - - $dest = 'fedora/41/debug-modular/aarch64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f41']; - $mod .= genModule('fedora/41/debug-php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/41/debug-php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); - $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); - $mod .= genModule('fedora/41/debug-php85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/41/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); - $mod .= genModule('fedora/41/debug-redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); - $mod .= genModule('fedora/41/debug-redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); - $mod .= genModule('fedora/41/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); - $mod .= genModule('fedora/41/debug-valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); - createRepo($dest, $mod); -} -if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { - $dest = 'fedora/41/modular-test/aarch64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f41']; - $mod .= genModule('fedora/41/test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/41/test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); - $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); - $mod .= genModule('fedora/41/test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); - createRepo($dest, $mod); - - $dest = 'fedora/41/debug-modular-test/aarch64'; - echo "Populate $dest\n"; - cleanup($dest); - $mod = ''; - - $deps = ['platform' => 'f41']; - $mod .= genModule('fedora/41/debug-test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); - $mod .= genModule('fedora/41/debug-test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); - $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); - $mod .= genModule('fedora/41/debug-test85/aarch64', $dest, '*.rpm', '8.5', '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'; @@ -9,7 +9,7 @@ if [ "$2" = "" ]; then echo -e "\t--noscl | --base only build PHP base packages" echo -e "\t--mock distro is a mock config name\n" echo -e "Targets:" - echo -e "\tDistribution: el8a el8x el9a el9x el10a el10x fc41a fc41x fc42a fc42x fc43a fc43x" + echo -e "\tDistribution: el8a el8x el9a el9x el10a el10x fc42a fc42x fc43a fc43x" echo -e "\tPHP: all, allx, zts" echo -e "\tMemcached: memcached" echo -e "\tLibraries: im6, im7, vips" @@ -149,12 +149,12 @@ if [ $REMOTE -ge 1 ]; then fi TARGET_IM6="el8xr el9x el8ar el9a" -TARGET_IM7="fc41x fc42x fc43x el8xr el9x el10x fc41a fc42a fc43a el8ar el9a el10a" +TARGET_IM7="fc42x fc43x el8xr el9x el10x fc42a fc43a el8ar el9a el10a" # PHP version matrix echo mockit $SRPM $DIST $MIN $MAX $@ case $DIST in - fc43x|fc43a|fc42x|fc42a|fc41x|fc41a|el9x|el9a|el10x|el10a) + fc43x|fc43a|fc42x|fc42a|el9x|el9a|el10x|el10a) LST="74 80 81 82 83 84 85" SCL="74 80 81 82 83 84 85" ;; @@ -168,7 +168,7 @@ case $DIST in ;; all) if [ $REDIS -ge 1 ]; then - for i in fc41x fc42x fc43x el8x el9x el10x fc41a fc42a fc43a el8a el9a el10a + for i in fc42x fc43x el8x el9x el10x fc42a fc43a el8a el9a el10a do [ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@ [ $BUILD_SCLS -ge 1 ] && $0 --valkey --scl $SRPM $i $MIN $MAX $@ @@ -179,7 +179,7 @@ case $DIST in ;; allx) if [ $REDIS -ge 1 ]; then - for i in fc41x fc42x fc43x el8x el9x el10x + for i in fc42x fc43x el8x el9x el10x do [ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@ [ $BUILD_SCLS -ge 1 ] && $0 --valkey --scl $SRPM $i $MIN $MAX $@ @@ -201,7 +201,7 @@ case $DIST in ;; memcached) if [ $REDIS -ge 1 ]; then - for i in fc41x fc42x fc43x el8x el9xm el10xm fc41a fc42a fc43a el8a el9am el10am + for i in fc42x fc43x el8x el9xm el10xm fc42a fc43a el8a el9am el10am do $0 --valkey --mock $SRPM $i $MIN $MAX $@ done @@ -246,17 +246,7 @@ case $DIST in ;; v81|v90) if [ $REDIS -ge 1 ]; then - for i in fc42x fc43x fc41x el8x el9x el10x fc41a fc42a fc43a el8a el9a el10a - do - $0 --valkey --mock $SRPM ${i}${DIST} $MIN $MAX $@ - done - else - echo Not supported for direct build - fi - ;; - r80|r82|r84) - if [ $REDIS -ge 1 ]; then - for i in fc42x fc41x fc43x el8x el9x el10x fc41a fc42a fc43a el8a el9a el10a + for i in fc42x fc43x el8x el9x el10x fc42a fc43a el8a el9a el10a do $0 --valkey --mock $SRPM ${i}${DIST} $MIN $MAX $@ done @@ -264,7 +254,7 @@ case $DIST in echo Not supported for direct build fi ;; - r86) + r80|r82|r84|r86) if [ $REDIS -ge 1 ]; then for i in fc42x fc43x el8x el9x el10x fc42a fc43a el8a el9a el10a do @@ -20,6 +20,7 @@ else name=$(basename $4 .spec) fi +Y=$(date +%Y) sed --regexp-extended \ --expression "/^Version:/s/[0-9.]+$/$1/" \ --expression "/github_version/s/[0-9.]+$/$1/" \ @@ -27,6 +28,7 @@ sed --regexp-extended \ --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 "/SPDX-FileCopyrightText/s/-20[0-9][0-9]/-$Y/" \ --expression "s/%changelog/%changelog\n* $rpmdate $vendor - $1-1\n- update to $1\n/" \ --in-place $name.spec |