diff options
| -rw-r--r-- | buildfct | 76 | ||||
| -rwxr-xr-x | cleanoldrpm | 11 | ||||
| -rwxr-xr-x | getmock | 43 | ||||
| -rwxr-xr-x | mkallrepo | 4 | ||||
| -rwxr-xr-x | mkmodular | 27 |
5 files changed, 70 insertions, 91 deletions
@@ -55,6 +55,18 @@ alias mockfc33xscl73=" mock --configdir=$mocketc -r fc33xscl73 alias mockfc33xscl74=" mock --configdir=$mocketc -r fc33xscl74 rebuild " alias mockfc33xscl80=" mock --configdir=$mocketc -r fc33xscl80 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 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 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 " @@ -134,7 +146,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 33 32 31 + for i in 33 34 32 do echo -n "$(date +%X) fc$i " mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !" @@ -160,7 +172,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 33 32 31 + for i in 34 33 32 do echo -n "$(date +%X) fc$i " mock $quiet --configdir=$mocketc -r fc${i}xr rebuild $1 && echo " Ok." || echo " Error !" @@ -186,7 +198,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 33 32 31 + for i in 33 32 34 do echo -n "$(date +%X) fc$i " mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !" @@ -250,7 +262,7 @@ fi if [ -f "$1" ]; then date +%X pids="" - for i in 32 31 33 + for i in 32 33 34 do echo -n "" (mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (7x) fc$i Ok." || echo "fc$1 Error !")& @@ -283,7 +295,7 @@ fi if [ -f "$1" ]; then date +%X pids="" - for i in 32 31 33 + for i in 32 33 34 do echo -n "" (mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (7x) fc$i Ok." || echo "fc$1 Error !")& @@ -305,39 +317,6 @@ else fi } -# Build All distribution / version / noarch for remi using PHP >= 7.2 -mock72m() -{ -quiet="--quiet" -if [ "$1" = "-q" ]; then - shift -fi - -if [ -f "$1" ]; then - date +%X - pids="" - for i in 31 - do - echo -n "" - (mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo "$(date +%X) (72) fc$i Ok." || echo "fc$1 Error !")& - pids="$pids $!" - done -# for i in 7 -# do -# echo -n "" -# (mock $quiet --configdir=$mocketc -r el${i}x72 rebuild $1 && echo "$(date +%X) (72) el$i Ok." || echo "el$i Error !")& -# pids="$pids $!" -# done - echo -n "" - (mock $quiet --configdir=$mocketc -r el8x rebuild $1 && echo "$(date +%X) (72) el8 Ok." || echo "el8 Error !")& - pids="$pids $!" - wait $pids - date +%X -else - echo "file not found '$1'" -fi -} - # Build All distribution / version / 64bits for remi/remi-php55 mock55x() { @@ -495,11 +474,6 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 31 - 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 8 7 do echo -n "$(date +%X) 74 el$i " @@ -521,7 +495,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 31 32 33 + for i in 32 33 34 do echo -n "$(date +%X) 80 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !" @@ -547,7 +521,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 33 32 31 + for i in 33 34 32 do echo -n "$(date +%X) scl80 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild $1 && echo " Ok." || echo " Error !" @@ -573,7 +547,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 33 32 31 + for i in 33 32 34 do echo -n "$(date +%X) scl74 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild $1 && echo " Ok." || echo " Error !" @@ -599,7 +573,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 33 32 31 + for i in 33 34 32 do echo -n "$(date +%X) scl73 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl73 rebuild $1 && echo " Ok." || echo " Error !" @@ -625,7 +599,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 33 32 31 + for i in 33 32 34 do echo -n "$(date +%X) scl72 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl72 rebuild $1 && echo " Ok." || echo " Error !" @@ -651,7 +625,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 33 32 31 + for i in 33 32 34 do echo -n "$(date +%X) scl71 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild $1 && echo " Ok." || echo " Error !" @@ -677,7 +651,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 33 32 31 + for i in 33 34 32 do echo -n "$(date +%X) scl70 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !" @@ -703,7 +677,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 33 32 31 + for i in 33 32 34 do echo -n "$(date +%X) scl56 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild $1 && echo " Ok." || echo " Error !" diff --git a/cleanoldrpm b/cleanoldrpm index 0e54faa..c72c4d0 100755 --- a/cleanoldrpm +++ b/cleanoldrpm @@ -7,9 +7,14 @@ $mode = 0; $keep = 0; $dest = false; $multi = [ - 'php' => 3, // php/8.0 - 'redis' => 3, // redis/6.2 - 'composer' => 1, // composer/2 + 'php' => 3, // php/8.0 + 'redis' => 3, // redis/6.2 + 'redis-devel' => 3, // redis/6.2 + 'redis-doc' => 3, // redis/6.2 + 'redis-trib' => 3, // redis/6.2 + 'redis' => 3, // redis/6.2 + 'composer' => 1, // composer/2 + 'phan' => 1, // phan/3 ]; if (isset($_SERVER['argv'][1])) { $keep = (int)$_SERVER['argv'][1]; @@ -243,28 +243,8 @@ if [ $1 = test72 ]; then opt=test72 shift fi -if [ $1 = php55 ]; then - opt=php55 - shift -fi -if [ $1 = php56 ]; then - opt=php56 - shift -fi -if [ $1 = php70 ]; then - opt=php70 - shift -fi -if [ $1 = php71 ]; then - opt=php71 - shift -fi -if [ $1 = php72 ]; then - opt=php72 - shift -fi -if [ $1 = php73 ]; then - opt=php73 +if [[ $1 = php* ]]; then + opt=$i shift fi if [[ $1 == glpi* ]]; then @@ -319,16 +299,15 @@ elif [ $1 = all73 ]; then elif [ $1 = all74 ]; then [ $opt = remi ] && opt=php74 [ $opt = test ] && opt=test74 - getOneMock fc31x $opt '*7.4*' getOneMock el7x $opt '*7.4*' getOneMock el8x74 $opt '*7.4*' elif [ $1 = all80 ]; then [ $opt = remi ] && opt=php80 [ $opt = test ] && opt=test80 - getOneMock fc31x $opt '*8.0*' getOneMock fc32x $opt '*8.0*' getOneMock fc33x $opt '*8.0*' + getOneMock fc34x $opt '*8.0*' getOneMock el7x $opt '*8.0*' getOneMock el8x80 $opt '*8.0*' @@ -349,7 +328,7 @@ elif [ $1 = for55 ]; then done elif [ $1 = allx ]; then - for i in 31 32 33 + for i in 32 33 34 do getOneMock fc${i}x $opt done @@ -371,7 +350,7 @@ elif [ $1 = scl55 ]; then done elif [ $1 = scl56 ]; then - for i in 33 31 32 + for i in 32 33 34 do getOneMock scl56fc${i}x $opt done @@ -381,7 +360,7 @@ elif [ $1 = scl56 ]; then done elif [ $1 = scl70 ]; then - for i in 31 32 33 + for i in 32 33 34 do getOneMock scl70fc${i}x $opt done @@ -391,7 +370,7 @@ elif [ $1 = scl70 ]; then done elif [ $1 = scl71 ]; then - for i in 31 32 33 + for i in 32 33 34 do getOneMock scl71fc${i}x $opt done @@ -401,7 +380,7 @@ elif [ $1 = scl71 ]; then done elif [ $1 = scl80 ]; then - for i in 31 32 33 + for i in 32 33 34 do getOneMock scl80fc${i}x $opt done @@ -411,7 +390,7 @@ elif [ $1 = scl80 ]; then done elif [ $1 = scl74 ]; then - for i in 31 32 33 + for i in 32 33 34 do getOneMock scl74fc${i}x $opt done @@ -421,7 +400,7 @@ elif [ $1 = scl74 ]; then done elif [ $1 = scl73 ]; then - for i in 31 32 33 + for i in 32 33 34 do getOneMock scl73fc${i}x $opt done @@ -431,7 +410,7 @@ elif [ $1 = scl73 ]; then done elif [ $1 = scl72 ]; then - for i in 31 32 33 + for i in 32 33 34 do getOneMock scl72fc${i}x $opt done @@ -10,7 +10,7 @@ TMPSIG2021=$(mktemp -t XXXXXXXX.2021) cd /home/rpmbuild/site/rpms -for dep in fedora/{31,32,33}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64} +for dep in fedora/{31,32,33,34}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64} do [[ $dep =~ /modular ]] && continue @@ -103,7 +103,7 @@ then echo "== Création des liens (noarch) ==" else echo "Rien à lier." fi -for dep in SRPMS fedora/{31,32,33}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64} +for dep in SRPMS fedora/{31,32,33,34}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64} do [[ $dep =~ /modular ]] && continue @@ -240,7 +240,7 @@ EOT; function findPackages($from, $dest, $pat) { global $oldrpms; - $excl = ['php-amqplib', 'php-jsonlint', 'php-laminas-mime', 'php-cs-fixer']; + $excl = ['php-amqplib', 'php-jsonlint', 'php-laminas-mime', 'php-cs-fixer', 'php-tecnickcom-tc-lib-unicode-data', 'php-doctrine-orm']; $rpms = []; foreach (glob("$from/$pat") as $file) { $info = rpminfo($file); @@ -334,7 +334,7 @@ rename($data, "$data.$arch"); chdir($old); } - +/* if (count($_SERVER['argv']) < 2 || in_array('f31', $_SERVER['argv'])) { $dest = 'fedora/31/modular/x86_64'; echo "Populate $dest\n"; @@ -359,7 +359,7 @@ if (in_array('f31', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('fedora/31/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } - +*/ if (count($_SERVER['argv']) < 2 || in_array('f32', $_SERVER['argv'])) { $dest = 'fedora/32/modular/x86_64'; echo "Populate $dest\n"; @@ -400,6 +400,26 @@ if (in_array('f33', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { createRepo($dest, $mod); } +if (count($_SERVER['argv']) < 2 || in_array('f34', $_SERVER['argv'])) { + $dest = 'fedora/34/modular/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $deps = ['platform' => 'f34']; + $mod = genModule('fedora/34/remi/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/34/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genDefaults('php', 'remi-7.4', ['remi-7.4', 'remi-8.0']); + createRepo($dest, $mod); +} +if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { + $dest = 'fedora/34/modular-test/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $deps = ['platform' => 'f34']; + $mod = genModule('fedora/34/test/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/34/test80/x86_64', $dest, '*.rpm', '8.0', '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"; @@ -476,6 +496,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) { $mod .= genDefaults('php', '7.2', ['remi-7.1', 'remi-7.2', 'remi-7.3', 'remi-7.4']); $mod .= genModule('enterprise/7/remi/x86_64', $dest, 'redis*5.0*.rpm', '5.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/7/remi/x86_64', $dest, 'redis*6.0*.rpm', '6.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/7/remi/x86_64', $dest, 'redis*6.2*.rpm', '6.0', 'x86_64', $deps, $template_redis); $mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0']); $deps = ['platform' => 'el7', 'php' => '']; $mod .= genModule('enterprise/7/glpi92/x86_64', $dest, '*.rpm', '9.2', 'x86_64', $deps, $template_glpi); |