From e2947a77f2c1d303eaaaee24df3af4ba4b502238 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 14 Feb 2024 16:33:04 +0100 Subject: F40 helpers --- buildfct | 37 +++++++++++++--- getmock | 29 ++++++++++++- mkallrepo | 5 ++- mkmodular | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- mockit | 2 +- 5 files changed, 206 insertions(+), 14 deletions(-) diff --git a/buildfct b/buildfct index b9bfa86..530b0bd 100644 --- a/buildfct +++ b/buildfct @@ -113,6 +113,23 @@ alias mockfc39xr70=" mock --configdir=$mocketc -r fc39xr70 alias mockfc39xr72=" mock --configdir=$mocketc -r fc39xr72 rebuild " alias mockfc39xm=" mock --configdir=$mocketc -r fc39xm rebuild " +alias mockfc40x=" mock --configdir=$mocketc -r fc40x rebuild " +alias mockfc40x74=" mock --configdir=$mocketc -r fc40x74 rebuild " +alias mockfc40x80=" mock --configdir=$mocketc -r fc40x80 rebuild " +alias mockfc40x81=" mock --configdir=$mocketc -r fc40x81 rebuild " +alias mockfc40x82=" mock --configdir=$mocketc -r fc40x82 rebuild " +alias mockfc40x83=" mock --configdir=$mocketc -r fc40x83 rebuild " +alias mockfc40xscl74=" mock --configdir=$mocketc -r fc40xscl74 rebuild " +alias mockfc40xscl80=" mock --configdir=$mocketc -r fc40xscl80 rebuild " +alias mockfc40xscl81=" mock --configdir=$mocketc -r fc40xscl81 rebuild " +alias mockfc40xscl82=" mock --configdir=$mocketc -r fc40xscl82 rebuild " +alias mockfc40xscl83=" mock --configdir=$mocketc -r fc40xscl83 rebuild " +alias mockfc40xr60=" mock --configdir=$mocketc -r fc40xr60 rebuild " +alias mockfc40xr62=" mock --configdir=$mocketc -r fc40xr62 rebuild " +alias mockfc40xr70=" mock --configdir=$mocketc -r fc40xr70 rebuild " +alias mockfc40xr72=" mock --configdir=$mocketc -r fc40xr72 rebuild " +alias mockfc40xm=" mock --configdir=$mocketc -r fc40xm 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 " @@ -351,7 +368,10 @@ if [ -f "$1" ]; then date +%X pids="" echo -n "" - (mock $quiet --configdir=$mocketc -r fc39x rebuild "$@" && echo "$(date +%X) (82) fc39 Ok." || echo "fc38 Error !")& + (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (82) fc40 Ok." || echo "fc40 Error !")& + pids="$pids $!" + echo -n "" + (mock $quiet --configdir=$mocketc -r fc39x rebuild "$@" && echo "$(date +%X) (82) fc39 Ok." || echo "fc39 Error !")& pids="$pids $!" echo -n "" (mock $quiet --configdir=$mocketc -r fc38x rebuild "$@" && echo "$(date +%X) (82) fc38 Ok." || echo "fc38 Error !")& @@ -384,7 +404,10 @@ if [ -f "$1" ]; then date +%X pids="" echo -n "" - (mock $quiet --configdir=$mocketc -r fc39x rebuild "$@" && echo "$(date +%X) (82) fc39 Ok." || echo "fc38 Error !")& + (mock $quiet --configdir=$mocketc -r fc40x rebuild "$@" && echo "$(date +%X) (82) fc40 Ok." || echo "fc40 Error !")& + pids="$pids $!" + echo -n "" + (mock $quiet --configdir=$mocketc -r fc39x rebuild "$@" && echo "$(date +%X) (82) fc39 Ok." || echo "fc39 Error !")& pids="$pids $!" echo -n "" (mock $quiet --configdir=$mocketc -r fc38x rebuild "$@" && echo "$(date +%X) (82) fc38 Ok." || echo "fc38 Error !")& @@ -562,7 +585,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 38 39 + for i in 38 39 40 do echo -n "$(date +%X) 74 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !" @@ -770,7 +793,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 38 39 + for i in 38 40 39 do echo -n "$(date +%X) 83 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !" @@ -838,7 +861,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 39 38 + for i in 40 39 38 do echo -n "$(date +%X) 82 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !" @@ -864,7 +887,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 38 39 + for i in 38 40 39 do echo -n "$(date +%X) 81 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !" @@ -890,7 +913,7 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then - for i in 38 39 + for i in 38 39 40 do echo -n "$(date +%X) 80 fc$i " mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !" diff --git a/getmock b/getmock index 2679c3a..88b385b 100755 --- a/getmock +++ b/getmock @@ -306,6 +306,13 @@ do cp $i priv/el9.x86_64 && echo + $i copied priv EL9 fi ;; + remi-crypto*fc40*) + if [ -f priv/fc40.x86_64/$j ]; then + echo " " $i already there + else + cp $i priv/fc40.x86_64 && echo + $i copied priv FC40 + fi + ;; *-debuginfo-*aarch64.rpm|*-debugsource-*aarch64.rpm) if [ -f ${debug}aarch64/$j ]; then echo " " $i already there @@ -472,6 +479,8 @@ elif [ $1 = all74 ]; then getOneMock fc38x74 $opt '*7.4*' getOneMock fc39x74 $opt '*7.4*' getOneMock fc39a74 $opt '*7.4*' + getOneMock fc40x74 $opt '*7.4*' + getOneMock fc40a74 $opt '*7.4*' getOneMock el7x74 $opt '*7.4*' getOneMock el8x74 $opt '*7.4*' getOneMock el8a74 $opt '*7.4*' @@ -484,6 +493,8 @@ elif [ $1 = all80 ]; then getOneMock fc38x80 $opt '*8.0*' getOneMock fc39x80 $opt '*8.0*' getOneMock fc39a80 $opt '*8.0*' + getOneMock fc40x80 $opt '*8.0*' + getOneMock fc40a80 $opt '*8.0*' getOneMock el7x80 $opt '*8.0*' getOneMock el8x80 $opt '*8.0*' getOneMock el8a80 $opt '*8.0*' @@ -496,6 +507,8 @@ elif [ $1 = all81 ]; then getOneMock fc38x81 $opt '*8.1*' getOneMock fc39x81 $opt '*8.1*' getOneMock fc39a81 $opt '*8.1*' + getOneMock fc40x81 $opt '*8.1*' + getOneMock fc40a81 $opt '*8.1*' getOneMock el7x81 $opt '*8.1*' getOneMock el8x81 $opt '*8.1*' getOneMock el8a81 $opt '*8.1*' @@ -508,6 +521,8 @@ elif [ $1 = all82 ]; then getOneMock fc38x82 $opt '*8.2*' getOneMock fc39x82 $opt '*8.2*' getOneMock fc39a82 $opt '*8.2*' + getOneMock fc40x82 $opt '*8.2*' + getOneMock fc40a82 $opt '*8.2*' getOneMock el7x82 $opt '*8.2*' getOneMock el8x82 $opt '*8.2*' getOneMock el8a82 $opt '*8.2*' @@ -520,6 +535,8 @@ elif [ $1 = all83 ]; then getOneMock fc38x83 $opt '*8.3*' getOneMock fc39x83 $opt '*8.3*' getOneMock fc39a83 $opt '*8.3*' + getOneMock fc40x83 $opt '*8.3*' + getOneMock fc40a83 $opt '*8.3*' getOneMock el7x83 $opt '*8.3*' getOneMock el8x83 $opt '*8.3*' getOneMock el8a83 $opt '*8.3*' @@ -577,6 +594,8 @@ elif [ $1 = allr60 ]; then getOneMock fc38x $opt '*6.0*' getOneMock fc39x $opt '*6.0*' getOneMock fc39a $opt '*6.0*' + getOneMock fc40x $opt '*6.0*' + getOneMock fc40a $opt '*6.0*' getOneMock el8x $opt '*6.0*' getOneMock el8a $opt '*6.0*' getOneMock el9x $opt '*6.0*' @@ -589,6 +608,8 @@ elif [ $1 = allr62 ]; then getOneMock fc38x $opt '*6.2*' getOneMock fc39x $opt '*6.2*' getOneMock fc39a $opt '*6.2*' + getOneMock fc40x $opt '*6.2*' + getOneMock fc40a $opt '*6.2*' getOneMock el8x $opt '*6.2*' getOneMock el8a $opt '*6.2*' getOneMock el9x $opt '*6.2*' @@ -601,6 +622,8 @@ elif [ $1 = allr70 ]; then getOneMock fc38x $opt '*7.0*' getOneMock fc39x $opt '*7.0*' getOneMock fc39a $opt '*7.0*' + getOneMock fc40x $opt '*7.0*' + getOneMock fc40a $opt '*7.0*' getOneMock el8x $opt '*7.0*' getOneMock el8a $opt '*7.0*' getOneMock el9x $opt '*7.0*' @@ -613,6 +636,8 @@ elif [ $1 = allr72 ]; then getOneMock fc38x $opt '*7.2*' getOneMock fc39x $opt '*7.2*' getOneMock fc39a $opt '*7.2*' + getOneMock fc40x $opt '*7.2*' + getOneMock fc40a $opt '*7.2*' getOneMock el8x $opt '*7.2*' getOneMock el8a $opt '*7.2*' getOneMock el9x $opt '*7.2*' @@ -646,7 +671,7 @@ elif [ $1 = for55 ]; then done elif [ $1 = allx ]; then - for i in 38 39 + for i in 38 39 40 do getOneMock fc${i}x $opt done @@ -656,7 +681,7 @@ elif [ $1 = allx ]; then done elif [ $1 = alla ]; then - for i in 39 + for i in 39 40 do getOneMock fc${i}a $opt done diff --git a/mkallrepo b/mkallrepo index 464983b..7a28747 100755 --- a/mkallrepo +++ b/mkallrepo @@ -10,7 +10,7 @@ TMPSIG2024=$(mktemp -t XXXXXXXX.2024) cd /home/rpmbuild/site/rpms -for dep in fedora/{38,39}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64} +for dep in fedora/{38,39,40}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64} do [[ $dep =~ /modular ]] && continue [[ $dep =~ /debug-modular ]] && continue @@ -50,6 +50,7 @@ if [ -s $TMPSIG ]; then grep fc39 $TMPSIG >> $TMPSIG2023 # 2024 grep src.rpm $TMPSIG > $TMPSIG2024 + grep fc40 $TMPSIG >> $TMPSIG2024 if [ -s $TMPSIG2024 ]; then echo "== Signature des $(cat $TMPSIG2024 | wc -l) nouveaux RPM (2024) ==" @@ -104,7 +105,7 @@ then echo "== Création des liens (noarch) ==" else echo "Rien à lier." fi -for dep in SRPMS fedora/{38,39}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64} +for dep in SRPMS fedora/{38,39,40}/*/{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 88132c9..e6c71b4 100755 --- a/mkmodular +++ b/mkmodular @@ -35,7 +35,7 @@ data: requires: @DEPS@ references: - documentation: http://php.net/ + documentation: https://www.php.net/manual/ tracker: https://bugs.php.net/ profiles: common: @@ -300,6 +300,13 @@ function genDefaults($name, $def, Array $vers) { } function genModule($srce, $dest, $pats, $ver, $arch, $deps, $template) { + if ($deps['platform'] >= 'f40') { + // Drop dependencies see https://bugzilla.redhat.com/2264207 + $deb = strpos($template, 'dependencies:'); + $fin = strpos($template, 'references:'); + $template = substr($template, 0, $deb) . substr($template, $fin); + } + $rpms = []; foreach ((array)$pats as $pat) { $rpms += findPackages($srce, $dest, $pat); @@ -571,7 +578,6 @@ if (in_array('f36', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('fedora/36/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } -*/ if (count($_SERVER['argv']) < 2 || in_array('f37', $_SERVER['argv'])) { $dest = 'fedora/37/modular/x86_64'; @@ -640,6 +646,7 @@ if (in_array('f37', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('fedora/37/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } +*/ if (count($_SERVER['argv']) < 2 || in_array('f38', $_SERVER['argv'])) { $dest = 'fedora/38/modular/x86_64'; @@ -845,6 +852,142 @@ if (in_array('f39', $_SERVER['argv']) || in_array('f39a', $_SERVER['argv']) || i createRepo($dest, $mod); } +if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array('f40x', $_SERVER['argv'])) { + $dest = 'fedora/40/modular/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f40']; + $mod .= genModule('fedora/40/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $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/40/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/40/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/40/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/40/redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2']); + $mod .= genModule('fedora/40/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); + $mod .= genDefaults('memcached', false, ['remi']); + createRepo($dest, $mod); + + $dest = 'fedora/40/debug-modular/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f40']; + $mod .= genModule('fedora/40/debug-php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/40/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/40/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/40/debug-redis72/x86_64',$dest, '*.rpm', '7.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/40/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached); + createRepo($dest, $mod); +} +if (in_array('f40', $_SERVER['argv']) || in_array('f40x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { + $dest = 'fedora/40/modular-test/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f40']; + $mod .= genModule('fedora/40/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + createRepo($dest, $mod); + + $dest = 'fedora/40/debug-modular-test/x86_64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f40']; + $mod .= genModule('fedora/40/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + createRepo($dest, $mod); +} + +if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array('f40a', $_SERVER['argv'])) { + $dest = 'fedora/40/modular/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f40']; + $mod .= genModule('fedora/40/php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/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/40/redis60/aarch64',$dest, '*.rpm', '6.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/40/redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/40/redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/40/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/40/memcached/aarch64',$dest, '*.rpm', false, 'aarch64', $deps, $template_memcached); + $mod .= genDefaults('memcached', false, ['remi']); + createRepo($dest, $mod); + + $dest = 'fedora/40/debug-modular/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f40']; + $mod .= genModule('fedora/40/debug-php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-redis60/aarch64',$dest, '*.rpm', '6.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/40/debug-redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/40/debug-redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/40/debug-redis72/aarch64',$dest, '*.rpm', '7.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/40/debug-memcached/aarch64',$dest, '*.rpm', false, 'aarch64', $deps, $template_memcached); + createRepo($dest, $mod); +} +if (in_array('f40', $_SERVER['argv']) || in_array('f40a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { + $dest = 'fedora/40/modular-test/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f40']; + $mod .= genModule('fedora/40/test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + createRepo($dest, $mod); + + $dest = 'fedora/40/debug-modular-test/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'f40']; + $mod .= genModule('fedora/40/debug-test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('fedora/40/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 24a304a..783500b 100755 --- a/mockit +++ b/mockit @@ -54,7 +54,7 @@ fi echo mockit $SRPM $DIST $MIN $MAX $@ case $DIST in - fc37x|fc38x|fc39x|fc39a|el9x|el9a) + fc38x|fc39x|fc39a|fc40x|fc40a|el9x|el9a) LST="82 81 74 80 83" SCL="74 80 81 82 83" ;; -- cgit