From 19fe469034903baaa5c87a238b9d55a697e12926 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Sep 2023 15:56:04 +0200 Subject: fc39 aarch64 helpers --- getmock | 10 ++++----- mkallrepo | 4 ++-- mkmodular | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- mockit | 2 +- 4 files changed, 78 insertions(+), 10 deletions(-) diff --git a/getmock b/getmock index 103b2ad..ec1e79a 100755 --- a/getmock +++ b/getmock @@ -163,7 +163,7 @@ el??83) fi type=enterprise ;; -fc??x74) +fc???74) dep=${1:2:2} if [ "$2" == "php74" -o "$2" == "test74" ] then rep=$rep @@ -173,7 +173,7 @@ fc??x74) fi type=fedora ;; -fc??x80) +fc???80) dep=${1:2:2} if [ "$2" == "php80" -o "$2" == "test80" ] then rep=$rep @@ -183,7 +183,7 @@ fc??x80) fi type=fedora ;; -fc??x81) +fc???81) dep=${1:2:2} if [ "$2" == "php81" -o "$2" == "test81" ] then rep=$rep @@ -193,7 +193,7 @@ fc??x81) fi type=fedora ;; -fc??x82) +fc???82) dep=${1:2:2} if [ "$2" == "php82" -o "$2" == "test82" ] then rep=$rep @@ -203,7 +203,7 @@ fc??x82) fi type=fedora ;; -fc??x83) +fc???83) dep=${1:2:2} if [ "$2" == "php83" -o "$2" == "test83" ] then rep=$rep diff --git a/mkallrepo b/mkallrepo index fc92c51..5720c90 100755 --- a/mkallrepo +++ b/mkallrepo @@ -10,7 +10,7 @@ TMPSIG2023=$(mktemp -t XXXXXXXX.2023) cd /home/rpmbuild/site/rpms -for dep in fedora/{36,37,38,39}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64} +for dep in fedora/{36,37,38,39}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64} do [[ $dep =~ /modular ]] && continue [[ $dep =~ /debug-modular ]] && continue @@ -108,7 +108,7 @@ then echo "== Création des liens (noarch) ==" else echo "Rien à lier." fi -for dep in SRPMS fedora/{36,37,38,39}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64} +for dep in SRPMS fedora/{36,37,38,39}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64} do [[ $dep =~ /modular ]] && continue [[ $dep =~ /debug-modular ]] && continue diff --git a/mkmodular b/mkmodular index 8a8ee1c..17a97d8 100755 --- a/mkmodular +++ b/mkmodular @@ -707,7 +707,7 @@ if (in_array('f38', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { createRepo($dest, $mod); } -if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv'])) { +if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array('f39x', $_SERVER['argv'])) { $dest = 'fedora/39/modular/x86_64'; echo "Populate $dest\n"; cleanup($dest); @@ -747,7 +747,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv'])) { $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'])) { +if (in_array('f39', $_SERVER['argv']) || in_array('f39x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $dest = 'fedora/39/modular-test/x86_64'; echo "Populate $dest\n"; cleanup($dest); @@ -775,6 +775,74 @@ if (in_array('f39', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { createRepo($dest, $mod); } +if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array('f39a', $_SERVER['argv'])) { + $dest = 'fedora/39/modular/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f39']; + $mod .= genModule('fedora/39/php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); + $mod .= genModule('fedora/39/redis60/aarch64',$dest, '*.rpm', '6.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/39/redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/39/redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/39/redis72/aarch64',$dest, '*.rpm', '7.2', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']); + $mod .= genModule('fedora/39/memcached/aarch64',$dest, '*.rpm', false, 'aarch64', $deps, $template_memcached); + $mod .= genDefaults('memcached', false, ['remi']); + createRepo($dest, $mod); + + $dest = 'fedora/39/debug-modular/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f39']; + $mod .= genModule('fedora/39/debug-php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-redis60/aarch64',$dest, '*.rpm', '6.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/39/debug-redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/39/debug-redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/39/debug-redis72/aarch64',$dest, '*.rpm', '7.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/39/debug-memcached/aarch64',$dest, '*.rpm', false, 'aarch64', $deps, $template_memcached); + createRepo($dest, $mod); +} +if (in_array('f39', $_SERVER['argv']) || in_array('f39a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { + $dest = 'fedora/39/modular-test/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f39']; + $mod .= genModule('fedora/39/test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + createRepo($dest, $mod); + + $dest = 'fedora/39/debug-modular-test/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f39']; + $mod .= genModule('fedora/39/debug-test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + createRepo($dest, $mod); +} + if (in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $dest = 'enterprise/8/modular-test/x86_64'; echo "Populate $dest\n"; diff --git a/mockit b/mockit index e42d6a2..d7c98c7 100755 --- a/mockit +++ b/mockit @@ -54,7 +54,7 @@ fi echo mockit $SRPM $DIST $MIN $MAX $@ case $DIST in - fc37x|fc38x|fc39x|el9x|el9a|el8a) + fc37x|fc38x|fc39x|fc39a|el9x|el9a|el8a) LST="81 74 80 82 83" SCL="74 80 81 82 83" ;; -- cgit