diff options
| -rw-r--r-- | buildfct | 42 | ||||
| -rwxr-xr-x | getmock | 13 | ||||
| -rwxr-xr-x | mkmodular | 65 |
3 files changed, 64 insertions, 56 deletions
@@ -131,8 +131,10 @@ alias mockel8xscl81=" mock --configdir=$mocketc -r el8xscl81 r alias mockel9x=" mock --configdir=$mocketc -r el9x rebuild " alias mockel9xr=" mock --configdir=$mocketc -r el9xr rebuild " alias mockel9n=" mock --configdir=$mocketc -r el9n rebuild " +alias mockel9x74=" mock --configdir=$mocketc -r el9x74 rebuild " alias mockel9x80=" mock --configdir=$mocketc -r el9x80 rebuild " alias mockel9x81=" mock --configdir=$mocketc -r el9x81 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 " @@ -258,42 +260,6 @@ else fi } -# Build All distribution / version / noarch for remi using PHP >= 7.3 -mock73n() -{ -quiet="--quiet" -if [ "$1" = "-q" ]; then - shift -fi - -if [ -f "$1" ]; then - date +%X - pids="" - for i in 33 34 35 - do - echo -n "" - (mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo "$(date +%X) (7x) fc$i Ok." || echo "fc$1 Error !")& - pids="$pids $!" - done - for i in 7 - do - echo -n "" - (mock $quiet --configdir=$mocketc -r el${i}x73 rebuild "$@" && echo "$(date +%X) (73) el$i Ok." || echo "el$i Error !")& - pids="$pids $!" - done - echo -n "" - (mock $quiet --configdir=$mocketc -r el8x rebuild "$@" && echo "$(date +%X) (74) el8 Ok." || echo "el8 Error !")& - pids="$pids $!" - echo -n "" - (mock $quiet --configdir=$mocketc -r el9x rebuild "$@" && echo "$(date +%X) (80) el9 Ok." || echo "el9 Error !")& - pids="$pids $!" - wait $pids - date +%X -else - echo "file not found '$1'" -fi -} - # Build All distribution / version / noarch for remi using PHP >= 7.4 mock74n() { @@ -487,7 +453,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 8 7 + for i in 9 8 7 do echo -n "$(date +%X) 74 el$i " mock $quiet --configdir=$mocketc -r el${i}x74 rebuild "$@" && echo " Ok." || echo " Error !" @@ -617,7 +583,7 @@ if [ -f "$1" ]; then echo -n "$(date +%X) scl74 fc$i " mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !" done - for i in 7 8 + for i in 7 9 8 do echo -n "$(date +%X) scl74 el$i " mock $quiet --configdir=$mocketc -r el${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !" @@ -85,6 +85,16 @@ el8x80) fi type=enterprise ;; +el9x74) + dep=9 + if [ "$2" == "php74" -o "$2" == "test74" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php74 + else rep=${2}74 + fi + type=enterprise + ;; el9x80) dep=9 if [ "$2" == "php80" -o "$2" == "test80" ] @@ -341,6 +351,7 @@ elif [ $1 = all74 ]; then [ $opt = test ] && opt=test74 getOneMock el7x $opt '*7.4*' getOneMock el8x74 $opt '*7.4*' + getOneMock el9x74 $opt '*7.4*' elif [ $1 = all80 ]; then [ $opt = remi ] && opt=php80 @@ -454,7 +465,7 @@ elif [ $1 = scl74 ]; then do getOneMock scl74fc${i}x $opt done - for i in 7 8 + for i in 7 8 9 do getOneMock scl74el${i}x $opt done @@ -244,8 +244,10 @@ EOT; function findPackages($from, $dest, $pat) { global $oldrpms; $excl = [ - 'php-amqplib', 'php-jsonlint', 'php-laminas-mime', 'php-cs-fixer', 'php-tecnickcom-tc-lib-unicode-data', 'php-doctrine-orm', - 'php-icewind-streams', 'php-masterminds-html5', + 'php-amqplib', 'php-jsonlint', 'php-cs-fixer', 'php-tecnickcom-tc-lib-unicode-data', + 'php-doctrine-orm', + 'php-laminas-authentication', 'php-laminas-diactoros2', 'php-laminas-mime', 'php-laminas-i18n-resources', + 'php-icewind-streams', 'php-masterminds-html5', 'php-league-mime-type-detection', ]; $rpms = []; foreach (glob("$from/$pat") as $file) { @@ -374,8 +376,10 @@ if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) { $dest = 'fedora/33/modular/x86_64'; echo "Populate $dest\n"; cleanup($dest); + $mod = ''; + $deps = ['platform' => 'f33']; - $mod = genModule('fedora/33/remi/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/33/remi/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/33/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/33/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']); @@ -385,8 +389,10 @@ if (in_array('f33', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $dest = 'fedora/33/modular-test/x86_64'; echo "Populate $dest\n"; cleanup($dest); + $mod = ''; + $deps = ['platform' => 'f33']; - $mod = genModule('fedora/33/test/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/33/test/x86_64', $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/33/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/33/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); @@ -396,8 +402,10 @@ if (count($_SERVER['argv']) < 2 || in_array('f34', $_SERVER['argv'])) { $dest = 'fedora/34/modular/x86_64'; echo "Populate $dest\n"; cleanup($dest); + $mod = ''; + $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/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 .= genModule('fedora/34/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']); @@ -407,8 +415,10 @@ if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $dest = 'fedora/34/modular-test/x86_64'; echo "Populate $dest\n"; cleanup($dest); + $mod = ''; + $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/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); $mod .= genModule('fedora/34/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); @@ -418,8 +428,10 @@ if (count($_SERVER['argv']) < 2 || in_array('f35', $_SERVER['argv'])) { $dest = 'fedora/35/modular/x86_64'; echo "Populate $dest\n"; cleanup($dest); + $mod = ''; + $deps = ['platform' => 'f35']; - $mod = genModule('fedora/35/remi/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/35/remi/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genDefaults('php', false, ['remi-8.0', 'remi-8.1']); createRepo($dest, $mod); @@ -428,8 +440,10 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $dest = 'fedora/35/modular-test/x86_64'; echo "Populate $dest\n"; cleanup($dest); + $mod = ''; + $deps = ['platform' => 'f35']; - $mod = genModule('fedora/35/test/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/35/test/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } @@ -438,8 +452,10 @@ if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $dest = 'enterprise/8/modular-test/x86_64'; echo "Populate $dest\n"; cleanup($dest); + $mod = ''; + $deps = ['platform' => 'el8']; - $mod = genModule('enterprise/8/test72/x86_64', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/8/test72/x86_64', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/test73/x86_64', $dest, '*.rpm', '7.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); @@ -450,8 +466,10 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) { $dest = 'enterprise/8/modular/x86_64'; echo "Populate $dest\n"; cleanup($dest); + $mod = ''; + $deps = ['platform' => 'el8']; - $mod = genModule('enterprise/8/php72/x86_64', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/8/php72/x86_64', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/php73/x86_64', $dest, '*.rpm', '7.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); @@ -473,7 +491,10 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $dest = 'enterprise/9/modular-test/x86_64'; echo "Populate $dest\n"; cleanup($dest); + $mod = ''; + $deps = ['platform' => 'el9']; + $mod .= genModule('enterprise/9/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); @@ -482,18 +503,22 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $dest = 'enterprise/9/modular/x86_64'; echo "Populate $dest\n"; cleanup($dest); + $mod = ''; + $deps = ['platform' => 'el9']; + $mod .= genModule('enterprise/9/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); - $mod .= genDefaults('php', false, ['remi-8.0', 'remi-8.1']); - $deps = ['platform' => 'el9']; + $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']); + $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); $mod .= genModule('enterprise/9/redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genDefaults('redis', false, ['remi-5.0', 'remi-6.0', 'remi-6.2']); + $mod .= genModule('enterprise/9/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); - $deps = ['platform' => 'el9', 'php' => '']; + $mod .= genModule('enterprise/9/composer2/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); $mod .= genDefaults('composer', '2', ['2']); createRepo($dest, $mod); @@ -504,8 +529,10 @@ if (count($_SERVER['argv']) > 1 && in_array('epel', $_SERVER['argv'])) { $dest = 'temp/epel-8-modular'; echo "Populate $dest\n"; cleanup($dest); + $mod = ''; + $deps = ['platform' => 'el8', 'php' => '7.2']; - $mod = genModule('temp/epel-8-php-7.2', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_phpextras); + $mod .= genModule('temp/epel-8-php-7.2', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_phpextras); $deps = ['platform' => 'el8', 'php' => '7.3']; $mod .= genModule('temp/epel-8-php-7.3', $dest, '*.rpm', '7.3', 'x86_64', $deps, $template_phpextras); $deps = ['platform' => 'el8', 'php' => '7.4']; @@ -518,9 +545,11 @@ if (in_array('el7', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $dest = 'enterprise/7/modular-test/x86_64'; echo "Populate $dest\n"; cleanup($dest); + $mod = ''; + $deps = ['platform' => 'el7']; - $mod = genModule('enterprise/7/test71/x86_64', $dest, '*.rpm', '7.1', 'x86_64', $deps, $template_php); - $mod = genModule('enterprise/7/test72/x86_64', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/7/test71/x86_64', $dest, '*.rpm', '7.1', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/7/test72/x86_64', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/test73/x86_64', $dest, '*.rpm', '7.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); @@ -531,8 +560,10 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) { $dest = 'enterprise/7/modular/x86_64'; echo "Populate $dest\n"; cleanup($dest); + $mod = ''; + $deps = ['platform' => 'el7']; - $mod = genModule('enterprise/7/php71/x86_64', $dest, '*.rpm', '7.1', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/7/php71/x86_64', $dest, '*.rpm', '7.1', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/php72/x86_64', $dest, '*.rpm', '7.2', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/php73/x86_64', $dest, '*.rpm', '7.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); |