diff options
| -rw-r--r-- | buildfct | 147 | ||||
| -rwxr-xr-x | getmock | 18 | ||||
| -rwxr-xr-x | mkallrepo | 5 | ||||
| -rwxr-xr-x | mkmodular | 66 | ||||
| -rwxr-xr-x | mockit | 16 | ||||
| -rwxr-xr-x | pearup | 53 |
6 files changed, 200 insertions, 105 deletions
@@ -5,56 +5,56 @@ alias rhpkg='echo NO PLEASE, use fedpkg' mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock -alias mockfc34i=" setarch i686 mock --configdir=$mocketc -r fc34i --arch i686 rebuild " -alias mockfc34x=" mock --configdir=$mocketc -r fc34x rebuild " -alias mockfc34xd=" mock --configdir=$mocketc -r fc34xd rebuild " -alias mockfc34xr=" mock --configdir=$mocketc -r fc34xr rebuild " -alias mockfc34x80=" mock --configdir=$mocketc -r fc34x80 rebuild " -alias mockfc34x81=" mock --configdir=$mocketc -r fc34x81 rebuild " -alias mockfc34xscl56=" mock --configdir=$mocketc -r fc34xscl56 rebuild " -alias mockfc34xscl70=" mock --configdir=$mocketc -r fc34xscl70 rebuild " -alias mockfc34xscl71=" mock --configdir=$mocketc -r fc34xscl71 rebuild " -alias mockfc34xscl72=" mock --configdir=$mocketc -r fc34xscl72 rebuild " -alias mockfc34xscl73=" mock --configdir=$mocketc -r fc34xscl73 rebuild " -alias mockfc34xscl74=" mock --configdir=$mocketc -r fc34xscl74 rebuild " -alias mockfc34xscl80=" mock --configdir=$mocketc -r fc34xscl80 rebuild " -alias mockfc34xscl81=" mock --configdir=$mocketc -r fc34xscl81 rebuild " - -alias mockfc35i=" setarch i686 mock --configdir=$mocketc -r fc35i --arch i686 rebuild " -alias mockfc35x=" mock --configdir=$mocketc -r fc35x rebuild " -alias mockfc35xd=" mock --configdir=$mocketc -r fc35xd rebuild " -alias mockfc35xr=" mock --configdir=$mocketc -r fc35xr rebuild " -alias mockfc35x74=" mock --configdir=$mocketc -r fc35x74 rebuild " -alias mockfc35x81=" mock --configdir=$mocketc -r fc35x81 rebuild " -alias mockfc35n81=" mock --configdir=$mocketc -r fc35n81 rebuild " -alias mockfc35x82=" mock --configdir=$mocketc -r fc35x82 rebuild " -alias mockfc35xscl56=" mock --configdir=$mocketc -r fc35xscl56 rebuild " -alias mockfc35xscl70=" mock --configdir=$mocketc -r fc35xscl70 rebuild " -alias mockfc35xscl71=" mock --configdir=$mocketc -r fc35xscl71 rebuild " -alias mockfc35xscl72=" mock --configdir=$mocketc -r fc35xscl72 rebuild " -alias mockfc35xscl73=" mock --configdir=$mocketc -r fc35xscl73 rebuild " -alias mockfc35xscl74=" mock --configdir=$mocketc -r fc35xscl74 rebuild " -alias mockfc35xscl80=" mock --configdir=$mocketc -r fc35xscl80 rebuild " -alias mockfc35xscl81=" mock --configdir=$mocketc -r fc35xscl81 rebuild " -alias mockfc35xscl82=" mock --configdir=$mocketc -r fc35xscl82 rebuild " - -alias mockfc36i=" setarch i686 mock --configdir=$mocketc -r fc36i --arch i686 rebuild " -alias mockfc36x=" mock --configdir=$mocketc -r fc36x rebuild " -alias mockfc36xd=" mock --configdir=$mocketc -r fc36xd rebuild " -alias mockfc36xr=" mock --configdir=$mocketc -r fc36xr rebuild " -alias mockfc36x74=" mock --configdir=$mocketc -r fc36x74 rebuild " -alias mockfc36x80=" mock --configdir=$mocketc -r fc36x80 rebuild " -alias mockfc36x81=" mock --configdir=$mocketc -r fc36x81 rebuild " -alias mockfc36x82=" mock --configdir=$mocketc -r fc36x82 rebuild " -alias mockfc36xscl74=" mock --configdir=$mocketc -r fc36xscl74 rebuild " -alias mockfc36xscl80=" mock --configdir=$mocketc -r fc36xscl80 rebuild " -alias mockfc36xscl81=" mock --configdir=$mocketc -r fc36xscl81 rebuild " -alias mockfc36xscl82=" mock --configdir=$mocketc -r fc36xscl82 rebuild " -alias mockfc36xr60=" mock --configdir=$mocketc -r fc36xr60 rebuild " -alias mockfc36xr62=" mock --configdir=$mocketc -r fc36xr62 rebuild " -alias mockfc36xr70=" mock --configdir=$mocketc -r fc36xr70 rebuild " -alias mockfc36xr72=" mock --configdir=$mocketc -r fc36xr72 rebuild " -alias mockfc36xm=" mock --configdir=$mocketc -r fc36xm rebuild " +#alias mockfc34i=" setarch i686 mock --configdir=$mocketc -r fc34i --arch i686 rebuild " +#alias mockfc34x=" mock --configdir=$mocketc -r fc34x rebuild " +#alias mockfc34xd=" mock --configdir=$mocketc -r fc34xd rebuild " +#alias mockfc34xr=" mock --configdir=$mocketc -r fc34xr rebuild " +#alias mockfc34x80=" mock --configdir=$mocketc -r fc34x80 rebuild " +#alias mockfc34x81=" mock --configdir=$mocketc -r fc34x81 rebuild " +#alias mockfc34xscl56=" mock --configdir=$mocketc -r fc34xscl56 rebuild " +#alias mockfc34xscl70=" mock --configdir=$mocketc -r fc34xscl70 rebuild " +#alias mockfc34xscl71=" mock --configdir=$mocketc -r fc34xscl71 rebuild " +#alias mockfc34xscl72=" mock --configdir=$mocketc -r fc34xscl72 rebuild " +#alias mockfc34xscl73=" mock --configdir=$mocketc -r fc34xscl73 rebuild " +#alias mockfc34xscl74=" mock --configdir=$mocketc -r fc34xscl74 rebuild " +#alias mockfc34xscl80=" mock --configdir=$mocketc -r fc34xscl80 rebuild " +#alias mockfc34xscl81=" mock --configdir=$mocketc -r fc34xscl81 rebuild " + +#alias mockfc35i=" setarch i686 mock --configdir=$mocketc -r fc35i --arch i686 rebuild " +#alias mockfc35x=" mock --configdir=$mocketc -r fc35x rebuild " +#alias mockfc35xd=" mock --configdir=$mocketc -r fc35xd rebuild " +#alias mockfc35xr=" mock --configdir=$mocketc -r fc35xr rebuild " +#alias mockfc35x74=" mock --configdir=$mocketc -r fc35x74 rebuild " +#alias mockfc35x81=" mock --configdir=$mocketc -r fc35x81 rebuild " +#alias mockfc35n81=" mock --configdir=$mocketc -r fc35n81 rebuild " +#alias mockfc35x82=" mock --configdir=$mocketc -r fc35x82 rebuild " +#alias mockfc35xscl56=" mock --configdir=$mocketc -r fc35xscl56 rebuild " +#alias mockfc35xscl70=" mock --configdir=$mocketc -r fc35xscl70 rebuild " +#alias mockfc35xscl71=" mock --configdir=$mocketc -r fc35xscl71 rebuild " +#alias mockfc35xscl72=" mock --configdir=$mocketc -r fc35xscl72 rebuild " +#alias mockfc35xscl73=" mock --configdir=$mocketc -r fc35xscl73 rebuild " +#alias mockfc35xscl74=" mock --configdir=$mocketc -r fc35xscl74 rebuild " +#alias mockfc35xscl80=" mock --configdir=$mocketc -r fc35xscl80 rebuild " +#alias mockfc35xscl81=" mock --configdir=$mocketc -r fc35xscl81 rebuild " +#alias mockfc35xscl82=" mock --configdir=$mocketc -r fc35xscl82 rebuild " + +#alias mockfc36i=" setarch i686 mock --configdir=$mocketc -r fc36i --arch i686 rebuild " +#alias mockfc36x=" mock --configdir=$mocketc -r fc36x rebuild " +#alias mockfc36xd=" mock --configdir=$mocketc -r fc36xd rebuild " +#alias mockfc36xr=" mock --configdir=$mocketc -r fc36xr rebuild " +#alias mockfc36x74=" mock --configdir=$mocketc -r fc36x74 rebuild " +#alias mockfc36x80=" mock --configdir=$mocketc -r fc36x80 rebuild " +#alias mockfc36x81=" mock --configdir=$mocketc -r fc36x81 rebuild " +#alias mockfc36x82=" mock --configdir=$mocketc -r fc36x82 rebuild " +#alias mockfc36xscl74=" mock --configdir=$mocketc -r fc36xscl74 rebuild " +#alias mockfc36xscl80=" mock --configdir=$mocketc -r fc36xscl80 rebuild " +#alias mockfc36xscl81=" mock --configdir=$mocketc -r fc36xscl81 rebuild " +#alias mockfc36xscl82=" mock --configdir=$mocketc -r fc36xscl82 rebuild " +#alias mockfc36xr60=" mock --configdir=$mocketc -r fc36xr60 rebuild " +#alias mockfc36xr62=" mock --configdir=$mocketc -r fc36xr62 rebuild " +#alias mockfc36xr70=" mock --configdir=$mocketc -r fc36xr70 rebuild " +#alias mockfc36xr72=" mock --configdir=$mocketc -r fc36xr72 rebuild " +#alias mockfc36xm=" mock --configdir=$mocketc -r fc36xm rebuild " alias mockfc37i=" setarch i686 mock --configdir=$mocketc -r fc37i --arch i686 rebuild " alias mockfc37x=" mock --configdir=$mocketc -r fc37x rebuild " @@ -94,6 +94,22 @@ alias mockfc38xr70=" mock --configdir=$mocketc -r fc38xr70 alias mockfc38xr72=" mock --configdir=$mocketc -r fc38xr72 rebuild " alias mockfc38xm=" mock --configdir=$mocketc -r fc38xm rebuild " +alias mockfc39x=" mock --configdir=$mocketc -r fc39x rebuild " +alias mockfc39x74=" mock --configdir=$mocketc -r fc39x74 rebuild " +alias mockfc39x80=" mock --configdir=$mocketc -r fc39x80 rebuild " +alias mockfc39x81=" mock --configdir=$mocketc -r fc39x81 rebuild " +alias mockfc39x82=" mock --configdir=$mocketc -r fc39x82 rebuild " +alias mockfc39xscl74=" mock --configdir=$mocketc -r fc39xscl74 rebuild " +alias mockfc39xscl80=" mock --configdir=$mocketc -r fc39xscl80 rebuild " +alias mockfc39xscl81=" mock --configdir=$mocketc -r fc39xscl81 rebuild " +alias mockfc39xscl82=" mock --configdir=$mocketc -r fc39xscl82 rebuild " +alias mockfc39xscl83=" mock --configdir=$mocketc -r fc39xscl83 rebuild " +alias mockfc39xr60=" mock --configdir=$mocketc -r fc39xr60 rebuild " +alias mockfc39xr62=" mock --configdir=$mocketc -r fc39xr62 rebuild " +alias mockfc39xr70=" mock --configdir=$mocketc -r fc39xr70 rebuild " +alias mockfc39xr72=" mock --configdir=$mocketc -r fc39xr72 rebuild " +alias mockfc39xm=" mock --configdir=$mocketc -r fc39xm rebuild " + alias mockel6i=" setarch i686 mock --configdir=$mocketc -r el6i --arch i686 rebuild " alias mockel6it=" setarch i686 mock --configdir=$mocketc -r el6it --arch i686 rebuild " alias mockel6i55="setarch i686 mock --configdir=$mocketc -r el6i55 --arch i686 rebuild " @@ -293,7 +309,7 @@ fi if [ -f "$1" ]; then date +%X pids="" - for i in 38 37 36 + for i in 38 37 do echo -n "" (mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo "$(date +%X) (8x) fc$i Ok." || echo "fc$1 Error !")& @@ -330,9 +346,6 @@ if [ -f "$1" ]; then (mock $quiet --configdir=$mocketc -r fc38x rebuild "$@" && echo "$(date +%X) (82) fc38 Ok." || echo "fc38 Error !")& pids="$pids $!" echo -n "" - (mock $quiet --configdir=$mocketc -r fc36x rebuild "$@" && echo "$(date +%X) (81) fc36 Ok." || echo "fc36 Error !")& - pids="$pids $!" - echo -n "" (mock $quiet --configdir=$mocketc -r fc37x rebuild "$@" && echo "$(date +%X) (81) fc37 Ok." || echo "fc37 Error !")& pids="$pids $!" echo -n "" @@ -508,7 +521,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 37 36 38 + for i in 37 38 39 do echo -n "$(date +%X) 74 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !" @@ -534,7 +547,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 37 38 + for i in 37 38 39 do echo -n "$(date +%X) scl83 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !" @@ -560,7 +573,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 37 36 38 + for i in 37 38 39 do echo -n "$(date +%X) scl82 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !" @@ -586,7 +599,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 37 38 36 + for i in 37 38 39 do echo -n "$(date +%X) scl81 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !" @@ -614,8 +627,6 @@ fi if [ -f "$1" ]; then echo -n "$(date +%X) r60 f37 " mock $quiet --configdir=$mocketc -r fc37xr60 rebuild "$@" && echo " Ok." || echo " Error !" - echo -n "$(date +%X) r60 f36 " - mock $quiet --configdir=$mocketc -r fc36xr60 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 " @@ -640,8 +651,6 @@ fi if [ -f "$1" ]; then echo -n "$(date +%X) r62 f37 " mock $quiet --configdir=$mocketc -r fc37xr62 rebuild "$@" && echo " Ok." || echo " Error !" - echo -n "$(date +%X) r62 f36 " - mock $quiet --configdir=$mocketc -r fc36xr62 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 " @@ -666,8 +675,6 @@ fi if [ -f "$1" ]; then echo -n "$(date +%X) r72 f37 " mock $quiet --configdir=$mocketc -r fc37xr72 rebuild "$@" && echo " Ok." || echo " Error !" - echo -n "$(date +%X) r72 f36 " - mock $quiet --configdir=$mocketc -r fc36xr72 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 " @@ -692,8 +699,6 @@ fi if [ -f "$1" ]; then echo -n "$(date +%X) r70 f37 " mock $quiet --configdir=$mocketc -r fc37xr70 rebuild "$@" && echo " Ok." || echo " Error !" - echo -n "$(date +%X) r70 f36 " - mock $quiet --configdir=$mocketc -r fc36xr70 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 " @@ -716,7 +721,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 37 36 38 + for i in 37 38 39 do echo -n "$(date +%X) 82 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !" @@ -742,7 +747,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 37 36 38 + for i in 37 38 39 do echo -n "$(date +%X) 81 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !" @@ -768,7 +773,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 37 36 38 + for i in 37 38 39 do echo -n "$(date +%X) 80 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !" @@ -794,7 +799,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 37 36 38 + for i in 37 38 39 do echo -n "$(date +%X) scl80 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !" @@ -820,7 +825,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 37 38 36 + for i in 37 38 39 do echo -n "$(date +%X) scl74 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !" @@ -447,9 +447,9 @@ elif [ $1 = all73 ]; then elif [ $1 = all74 ]; then [ $opt = remi ] && opt=php74 [ $opt = test ] && opt=test74 - getOneMock fc36x74 $opt '*7.4*' getOneMock fc37x74 $opt '*7.4*' getOneMock fc38x74 $opt '*7.4*' + getOneMock fc39x74 $opt '*7.4*' getOneMock el7x74 $opt '*7.4*' getOneMock el8x74 $opt '*7.4*' getOneMock el9x74 $opt '*7.4*' @@ -458,9 +458,9 @@ elif [ $1 = all74 ]; then elif [ $1 = all80 ]; then [ $opt = remi ] && opt=php80 [ $opt = test ] && opt=test80 - getOneMock fc36x80 $opt '*8.0*' getOneMock fc37x80 $opt '*8.0*' getOneMock fc38x80 $opt '*8.0*' + getOneMock fc39x80 $opt '*8.0*' getOneMock el7x80 $opt '*8.0*' getOneMock el8x80 $opt '*8.0*' getOneMock el9x80 $opt '*8.0*' @@ -469,9 +469,9 @@ elif [ $1 = all80 ]; then elif [ $1 = all81 ]; then [ $opt = remi ] && opt=php81 [ $opt = test ] && opt=test81 - getOneMock fc36x81 $opt '*8.1*' getOneMock fc37x81 $opt '*8.1*' getOneMock fc38x81 $opt '*8.1*' + getOneMock fc39x81 $opt '*8.1*' getOneMock el7x81 $opt '*8.1*' getOneMock el8x81 $opt '*8.1*' getOneMock el9x81 $opt '*8.1*' @@ -480,9 +480,9 @@ elif [ $1 = all81 ]; then elif [ $1 = all82 ]; then [ $opt = remi ] && opt=php82 [ $opt = test ] && opt=test82 - getOneMock fc36x82 $opt '*8.2*' getOneMock fc37x82 $opt '*8.2*' getOneMock fc38x82 $opt '*8.2*' + getOneMock fc39x82 $opt '*8.2*' getOneMock el7x82 $opt '*8.2*' getOneMock el8x82 $opt '*8.2*' getOneMock el9x82 $opt '*8.2*' @@ -600,7 +600,7 @@ elif [ $1 = scl71 ]; then done elif [ $1 = scl82 ]; then - for i in 36 37 38 + for i in 37 38 39 do getOneMock scl82fc${i}x $opt done @@ -610,13 +610,13 @@ elif [ $1 = scl82 ]; then done elif [ $1 = scl83 ]; then - for i in fc37 fc38 el7 el8 el9 + for i in fc37 fc38 39 el7 el8 el9 do getOneMock scl83${i}x $opt done elif [ $1 = scl81 ]; then - for i in 36 37 38 + for i in 37 38 39 do getOneMock scl81fc${i}x $opt done @@ -626,7 +626,7 @@ elif [ $1 = scl81 ]; then done elif [ $1 = scl80 ]; then - for i in 36 37 38 + for i in 37 38 39 do getOneMock scl80fc${i}x $opt done @@ -636,7 +636,7 @@ elif [ $1 = scl80 ]; then done elif [ $1 = scl74 ]; then - for i in 36 37 38 + for i in 37 38 39 do getOneMock scl74fc${i}x $opt done @@ -10,7 +10,7 @@ TMPSIG2023=$(mktemp -t XXXXXXXX.2023) cd /home/rpmbuild/site/rpms -for dep in fedora/{34,35,36,37,38}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64} +for dep in fedora/{36,37,38,39}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64} do [[ $dep =~ /modular ]] && continue [[ $dep =~ /debug-modular ]] && continue @@ -53,6 +53,7 @@ if [ -s $TMPSIG ]; then # 2023 grep src.rpm $TMPSIG > $TMPSIG2023 grep fc38 $TMPSIG >> $TMPSIG2023 + grep fc39 $TMPSIG >> $TMPSIG2023 if [ -s $TMPSIG2023 ]; then echo "== Signature des $(cat $TMPSIG2023 | wc -l) nouveaux RPM (2023) ==" @@ -107,7 +108,7 @@ then echo "== Création des liens (noarch) ==" else echo "Rien à lier." fi -for dep in SRPMS fedora/{34,35,36,37,38}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64} +for dep in SRPMS fedora/{36,37,38,39}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64} do [[ $dep =~ /modular ]] && continue [[ $dep =~ /debug-modular ]] && continue @@ -505,7 +505,6 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('fedora/35/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } -*/ if (count($_SERVER['argv']) < 2 || in_array('f36', $_SERVER['argv'])) { $dest = 'fedora/36/modular/x86_64'; @@ -570,6 +569,7 @@ if (in_array('f36', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('fedora/36/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } +*/ if (count($_SERVER['argv']) < 2 || in_array('f37', $_SERVER['argv'])) { $dest = 'fedora/37/modular/x86_64'; @@ -699,6 +699,70 @@ if (in_array('f38', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { createRepo($dest, $mod); } +if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv'])) { + $dest = 'fedora/39/modular/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f39']; + $mod .= genModule('fedora/39/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2']); + $mod .= genModule('fedora/39/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/39/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/39/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/39/redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']); + $mod .= genModule('fedora/39/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); + $mod .= genDefaults('memcached', false, ['remi']); + createRepo($dest, $mod); + + $dest = 'fedora/39/debug-modular/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f39']; + $mod .= genModule('fedora/39/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/39/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/39/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/39/debug-redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/39/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); + createRepo($dest, $mod); +} +if (in_array('f39', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { + $dest = 'fedora/39/modular-test/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f39']; + $mod .= genModule('fedora/39/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + createRepo($dest, $mod); + + $dest = 'fedora/39/debug-modular-test/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f39']; + $mod .= genModule('fedora/39/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + createRepo($dest, $mod); +} + if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $dest = 'enterprise/8/modular-test/x86_64'; echo "Populate $dest\n"; @@ -28,10 +28,14 @@ if [ ! -f $SRPM ]; then fi echo mockit $SRPM $DIST $MIN $MAX $@ case $DIST in - fc36x|fc37x|fc38x|el9x) + fc37x|fc38x|fc39x|el9x) LST="81 74 80 82" SCL="74 80 81 82 83" ;; + el9a) + LST="81 74 80 82" + SCL="" + ;; el8x) LST="72 73 74 80 81 82" SCL="56 70 71 72 73 74 80 81 82 83" @@ -41,22 +45,22 @@ case $DIST in SCL="54 55 56 70 71 72 73 74 80 81 82 83" ;; *) - Unkown DIST $DIST + echo Unkown DIST $DIST exit 1 ;; esac for i in $LST do - if [ $i -ge $MIN -a $i -le $MAX ]; then - echo -n "$(date +%X) $i " + if [ 0$i -ge $MIN -a 0$i -le $MAX ]; then + echo -n "$(date +%X) $i " mock -q --configdir=$mocketc -r ${DIST}${i} rebuild $SRPM "$@" && echo " Ok." || echo " Error !" fi done for i in $SCL do - if [ $i -ge $MIN -a $i -le $MAX ]; then - echo -n "$(date +%X) $i " + if [ 0$i -ge $MIN -a 0$i -le $MAX ]; then + echo -n "$(date +%X) scl$i " mock -q --configdir=$mocketc -r ${DIST}scl${i} rebuild $SRPM "$@" && echo " Ok." || echo " Error !" fi done @@ -14,34 +14,55 @@ else name=$(basename $PWD).spec fi +oldver="$1" +newver="$2" +rpmver="$2" + +if [ "x$4" = "xGA" ]; then + sed -e '/global upstream_prever/s/^#global/%global/' \ + -i *spec +elif [ -n "$4" ]; then + oldver="$1$4" +fi + +if [ "x$5" = "xGA" ]; then + sed -e '/global upstream_prever/s/^%global/#global/' \ + -i *spec +elif [ -n "$5" ]; then + sed -e "/global upstream_prever/s/$4/$5/" \ + -i *spec + newver="$2$5" + rpmver="$2~$5" +fi + if ! grep -q pecl_name $name; then -sed -e '/^Release:/s/[0-9].*$/1%{?dist}/' \ - -i *spec + sed -e '/^Release:/s/[0-9].*$/1%{?dist}/' \ + -i *spec else echo "Release inchangée" fi if ! grep -q "^Version:.*$2" $name; then -sed -e "/^Version:/s/$1/$2/" \ - -e "/upstream_version/s/$1/$2/" \ - -e "s/%changelog/%changelog\n* $rpmdate $vendor - $2-1\n- update to $2\n/" \ - -e 's/\$RPM_BUILD_ROOT/%{buildroot}/' \ - -i $name + sed -e "/^Version:/s/$1/$2/" \ + -e "/upstream_version/s/$1/$2/" \ + -e "s/%changelog/%changelog\n* $rpmdate $vendor - $rpmver-1\n- update to $newver\n/" \ + -e 's/\$RPM_BUILD_ROOT/%{buildroot}/' \ + -i $name else echo "Version déjà modifiée" fi spectool -g -S $name -tar xf *-$1.tgz package.xml && mv package.xml package-$1.xml -comp=$(tar xvf *-$1.tgz '*/composer.json') +tar xf *-$oldver.tgz package.xml && mv package.xml package-$oldver.xml +comp=$(tar xvf *-$oldver.tgz '*/composer.json') if [ -n "$comp" ]; then - mv $comp composer-$1.json + mv $comp composer-$oldver.json fi -tar xf *-$2.tgz package.xml && mv package.xml package-$2.xml -comp=$(tar xvf *-$2.tgz '*/composer.json') +tar xf *-$newver.tgz package.xml && mv package.xml package-$newver.xml +comp=$(tar xvf *-$newver.tgz '*/composer.json') if [ -n "$comp" ]; then - mv $comp composer-$2.json + mv $comp composer-$newver.json fi -colordiff -u package-$1.xml package-$2.xml -[ -f composer-$1.json -a -f composer-$2.json ] && \ - colordiff -u composer-$1.json composer-$2.json +colordiff -u package-$oldver.xml package-$newver.xml +[ -f composer-$oldver.json -a -f composer-$newver.json ] && \ + colordiff -u composer-$oldver.json composer-$newver.json |