diff options
| -rwxr-xr-x | getmock | 29 | ||||
| -rwxr-xr-x | mkallrepo | 12 | ||||
| -rwxr-xr-x | mkmodular | 50 |
3 files changed, 78 insertions, 13 deletions
@@ -8,6 +8,8 @@ case $1 in ;; *x) dep=${1%x} ;; +*a) dep=${1%a} + ;; *) dep=$1 ;; esac @@ -108,7 +110,7 @@ el?x73) fi type=enterprise ;; -el?x74) +el??74) dep=${1:2:1} if [ "$2" == "php74" -o "$2" == "test74" ] then rep=$rep @@ -118,7 +120,7 @@ el?x74) fi type=enterprise ;; -el?x80) +el??80) dep=${1:2:1} if [ "$2" == "php80" -o "$2" == "test80" ] then rep=$rep @@ -128,7 +130,7 @@ el?x80) fi type=enterprise ;; -el?x81) +el??81) dep=${1:2:1} if [ "$2" == "php81" -o "$2" == "test81" ] then rep=$rep @@ -258,6 +260,15 @@ do cp $i priv/el9.x86_64 && echo + $i copied priv EL9 fi ;; + *-debuginfo-*aarch64.rpm|*-debugsource-*aarch64.rpm) + if [ -f ${debug}aarch64/$j ]; then + echo " " $i already there + elif [ -d ${debug}aarch64 ]; then + cp $i ${debug}aarch64 && echo + $i copied debuginfo aarch64 + else + echo " " $i ignored + fi + ;; *-debuginfo-*x86_64.rpm|*-debugsource-*x86_64.rpm) if [ -f ${debug}x86_64/$j ]; then echo " " $i already there @@ -287,9 +298,6 @@ do [ -d ${cible}ppc64 -a ! -f ${cible}ppc64/.closed ] \ && ln ${cible} /$j ${cible}ppc64/$j \ && echo + $i linked ppc64 - #[ -d ${cible}i386 ] \ - # && ln ${cible}x86_64/$j ${cible}i386/$j \ - # && echo + $i linked x86_64 [ -d ${cible}armhfp ] \ && ln ${cible}x86_64/$j ${cible}armhfp/$j \ && echo + $i linked armhfp @@ -305,6 +313,13 @@ do cp $i ${cible}i386 && echo + $i copied i686 fi ;; + *.aarch64.rpm) + if [ -f ${cible}aarch64/$j ]; then + echo " " $i already there + else + cp $i ${cible}aarch64 && echo + $i copied aarch64 + fi + ;; *.x86_64.rpm) if [ -f ${cible}x86_64/$j ]; then echo " " $i already there @@ -323,6 +338,8 @@ if [ $# = 0 ]; then exit 1 fi +echo -e "\n\n\n---------------------------------------\n\n\n" + opt=remi if [ $1 = test ]; then opt=test @@ -19,12 +19,14 @@ do LST="" if [ -d $dep/repodata -a $dep -nt $dep/repodata -a ! -f $dep/.closed ] then echo "== Nouveaux RPM dans $dep ==" - if [ $arch = x86_64 ] - then - find $dep -name \*.rpm -a -newer $dep/repodata -print >>$TMPSIG + if [ $arch = x86_64 ]; then + find $dep -name \*.rpm -a -newer $dep/repodata -print >>$TMPSIG + elif [ $arch = aarch64 ]; then + find $dep -name \*.noarch.rpm -a -newer $dep/repodata -print >>$TMPLNK + find $dep -name \*.aarch64.rpm -a -newer $dep/repodata -print >>$TMPSIG else - find $dep -name \*.noarch.rpm -a -newer $dep/repodata -print >>$TMPLNK - find $dep -name \*.i?86.rpm -a -newer $dep/repodata -print >>$TMPSIG + find $dep -name \*.noarch.rpm -a -newer $dep/repodata -print >>$TMPLNK + find $dep -name \*.i?86.rpm -a -newer $dep/repodata -print >>$TMPSIG fi fi @@ -245,9 +245,11 @@ function findPackages($from, $dest, $pat) { global $oldrpms; $excl = [ 'php-amqplib', 'php-jsonlint', 'php-cs-fixer', 'php-tecnickcom-tc-lib-unicode-data', - 'php-doctrine-orm', + 'php-doctrine-orm', 'php-pear-phing', 'php-laminas-authentication', 'php-laminas-diactoros2', 'php-laminas-mime', 'php-laminas-i18n-resources', - 'php-laminas-memory', 'php-laminas-test', 'php-laminas-view', + 'php-laminas-memory', 'php-laminas-test', 'php-laminas-validator', 'php-laminas-view', + 'php-laminas-inputfilter', 'php-laminas-crypt', 'php-laminas-di3', 'php-laminas-mvc-plugin-flashmessenger', + 'php-react-promise-timer', 'php-laminas-filter', 'php-laminas-router', 'php-icewind-streams', 'php-masterminds-html5', 'php-league-mime-type-detection', ]; $rpms = []; @@ -651,6 +653,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } + if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $dest = 'enterprise/9/modular/x86_64'; echo "Populate $dest\n"; @@ -695,6 +698,49 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { createRepo($dest, $mod); } +if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv'])) { + $dest = 'enterprise/9/modular/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'el9']; + $mod .= genModule('enterprise/9/php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/9/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/9/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + $mod .= genDefaults('php', false, ['remi-7.4']); + +// $mod .= genModule('enterprise/9/redis50/aarch64', $dest, 'redis*.rpm', '5.0', 'aarch64', $deps, $template_redis); +// $mod .= genModule('enterprise/9/redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); +// $mod .= genModule('enterprise/9/redis62/aarch64', $dest, 'redis*.rpm', '6.2', 'aarch64', $deps, $template_redis); +// $mod .= genModule('enterprise/9/redis70/aarch64', $dest, 'redis*.rpm', '7.0', 'aarch64', $deps, $template_redis); +// $mod .= genDefaults('redis', false, ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0']); + +// $mod .= genModule('enterprise/9/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); +// $mod .= genDefaults('memcached', false, ['remi']); + + $mod .= genModule('enterprise/9/composer2/x86_64', $dest, '*noarch.rpm', '2', 'aarch64', $deps, $template_comp); + $mod .= genDefaults('composer', false, ['2']); + createRepo($dest, $mod); + + $dest = 'enterprise/9/debug-modular/aarch64'; + echo "Populate $dest\n"; + cleanup($dest); + $mod = ''; + + $deps = ['platform' => 'el9']; + $mod .= genModule('enterprise/9/debug-php74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/9/debug-php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/9/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); + +// $mod .= genModule('enterprise/9/debug-redis50/aarch64', $dest, 'redis*.rpm', '5.0', 'aarch64', $deps, $template_redis); +// $mod .= genModule('enterprise/9/debug-redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); +// $mod .= genModule('enterprise/9/debug-redis62/aarch64', $dest, 'redis*.rpm', '6.2', 'aarch64', $deps, $template_redis); +// $mod .= genModule('enterprise/9/debug-redis70/aarch64', $dest, 'redis*.rpm', '7.0', 'aarch64', $deps, $template_redis); + +// $mod .= genModule('enterprise/9/debug-memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); + createRepo($dest, $mod); +} if (count($_SERVER['argv']) > 1 && in_array('epel', $_SERVER['argv'])) { $dest = 'temp/epel-8-modular'; |