From 657537ca5c20a5834e458cf38d2ff8bb6ab8a73d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Oct 2023 11:34:01 +0200 Subject: EL-8 aarch64 7.2 and 7.3 helpers --- cleanoldrpm | 1 + getmock | 8 ++++++-- mkmodular | 8 ++++++++ mockit | 6 +++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/cleanoldrpm b/cleanoldrpm index 6639b2b..98bba48 100755 --- a/cleanoldrpm +++ b/cleanoldrpm @@ -17,6 +17,7 @@ $multi = [ 'redis' => 3, // redis/6.2 'composer' => 1, // composer/2 'phan' => 1, // phan/3 + 'roundcubemail' => 4, // roundcubemail/1.x. 'remi-release' => 3, // remi-release/8.5 ]; if (isset($_SERVER['argv'][1])) { diff --git a/getmock b/getmock index e0839c8..260d5c7 100755 --- a/getmock +++ b/getmock @@ -93,7 +93,7 @@ el?x71) fi type=enterprise ;; -el?x72) +el??72) dep=${1:2:1} if [ "$2" == "php72" -o "$2" == "test72" ] then rep=$rep @@ -103,7 +103,7 @@ el?x72) fi type=enterprise ;; -el?x73) +el??73) dep=${1:2:1} if [ "$2" == "php73" -o "$2" == "test73" ] then rep=$rep @@ -457,12 +457,14 @@ elif [ $1 = all72 ]; then [ $opt = test ] && opt=test72 getOneMock el7x72 $opt '*7.2*' getOneMock el8x72 $opt '*7.2*' + getOneMock el8a72 $opt '*7.2*' elif [ $1 = all73 ]; then [ $opt = remi ] && opt=php73 [ $opt = test ] && opt=test73 getOneMock el7x73 $opt '*7.3*' getOneMock el8x73 $opt '*7.3*' + getOneMock el8a73 $opt '*7.3*' elif [ $1 = all74 ]; then [ $opt = remi ] && opt=php74 @@ -769,12 +771,14 @@ elif [ $1 = scl73 ]; then do getOneMock scl73el${i}x $opt done + getOneMock scl73el8a $opt elif [ $1 = scl72 ]; then for i in 7 8 do getOneMock scl72el${i}x $opt done + getOneMock scl72el8a $opt else for i in $* diff --git a/mkmodular b/mkmodular index 714a7bd..54cc456 100755 --- a/mkmodular +++ b/mkmodular @@ -941,6 +941,8 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv']) || i $mod = ''; $deps = ['platform' => 'el8']; + $mod .= genModule('enterprise/8/test72/aarch64', $dest, '*.rpm', '7.2', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/8/test73/aarch64', $dest, '*.rpm', '7.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); @@ -957,6 +959,8 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv']) || i $mod = ''; $deps = ['platform' => 'el8']; + $mod .= genModule('enterprise/8/debug-test72/aarch64', $dest, '*.rpm', '7.2', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/8/debug-test73/aarch64', $dest, '*.rpm', '7.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); @@ -973,6 +977,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod = ''; $deps = ['platform' => 'el8']; + $mod .= genModule('enterprise/8/php72/aarch64', $dest, '*.rpm', '7.2', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/8/php73/aarch64', $dest, '*.rpm', '7.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); @@ -1001,6 +1007,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod = ''; $deps = ['platform' => 'el8']; + $mod .= genModule('enterprise/8/debug-php72/aarch64', $dest, '*.rpm', '7.2', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/8/debug-php73/aarch64', $dest, '*.rpm', '7.3', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); diff --git a/mockit b/mockit index d7c98c7..b6b445e 100755 --- a/mockit +++ b/mockit @@ -54,10 +54,14 @@ fi echo mockit $SRPM $DIST $MIN $MAX $@ case $DIST in - fc37x|fc38x|fc39x|fc39a|el9x|el9a|el8a) + fc37x|fc38x|fc39x|fc39a|el9x|el9a) LST="81 74 80 82 83" SCL="74 80 81 82 83" ;; + el8a) + LST="72 73 74 80 81 82 83" + SCL="72 73 74 80 81 82 83" + ;; el8x) LST="72 73 74 80 81 82 83" SCL="56 70 71 72 73 74 80 81 82 83" -- cgit