diff options
| -rw-r--r-- | buildfct | 6 | ||||
| -rwxr-xr-x | getmock | 11 | ||||
| -rwxr-xr-x | mkmodular | 6 |
3 files changed, 22 insertions, 1 deletions
@@ -52,6 +52,7 @@ alias mockfc35i=" setarch i686 mock --configdir=$mocketc -r fc35i --arch i68 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 mockfc35xscl56=" mock --configdir=$mocketc -r fc35xscl56 rebuild " alias mockfc35xscl70=" mock --configdir=$mocketc -r fc35xscl70 rebuild " @@ -450,6 +451,11 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then + for i in 35 + 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 9 8 7 do echo -n "$(date +%X) 74 el$i " @@ -135,6 +135,16 @@ el?x81) fi type=enterprise ;; +fc??x74) + dep=${1:2:2} + if [ "$2" == "php74" -o "$2" == "test74" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php74 + else rep=${2}74 + fi + type=fedora + ;; fc??x80) dep=${1:2:2} if [ "$2" == "php80" -o "$2" == "test80" ] @@ -379,6 +389,7 @@ elif [ $1 = all73 ]; then elif [ $1 = all74 ]; then [ $opt = remi ] && opt=php74 [ $opt = test ] && opt=test74 + getOneMock fc35x74 $opt '*7.4*' getOneMock el7x74 $opt '*7.4*' getOneMock el8x74 $opt '*7.4*' getOneMock el9x74 $opt '*7.4*' @@ -453,9 +453,10 @@ if (count($_SERVER['argv']) < 2 || in_array('f35', $_SERVER['argv'])) { $mod = ''; $deps = ['platform' => 'f35']; + $mod .= genModule('fedora/35/php74/x86_64', $dest, '*rpm', '7.4', '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']); + $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']); createRepo($dest, $mod); $dest = 'fedora/35/debug-modular/x86_64'; @@ -464,6 +465,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f35', $_SERVER['argv'])) { $mod = ''; $deps = ['platform' => 'f35']; + $mod .= genModule('fedora/35/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/debug-remi/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); @@ -475,6 +477,7 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod = ''; $deps = ['platform' => 'f35']; + $mod .= genModule('fedora/35/test74/x86_64', $dest, '*.rpm', '7.4', '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); @@ -485,6 +488,7 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod = ''; $deps = ['platform' => 'f35']; + $mod .= genModule('fedora/35/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/debug-test/x86_64', $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/35/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); |