From b68ec763e1cef8862d2fa6f24007cae180e3f763 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 24 May 2023 16:16:53 +0200
Subject: composer module helper

---
 mkmodular | 15 +++++++++------
 mkrepo    |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/mkmodular b/mkmodular
index 87eeead..57b30c3 100755
--- a/mkmodular
+++ b/mkmodular
@@ -731,7 +731,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/8/debug-test82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
-if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
+if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array('composer', $_SERVER['argv'])) {
 	$dest = 'enterprise/8/modular/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
@@ -759,7 +759,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/8/composer2/x86_64', $dest, '*.rpm',         '2', 'x86_64', $deps, $template_comp);
 	$mod .= genDefaults('composer', '2', ['1', '2']);
 	createRepo($dest, $mod);
-
+}
+if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
 	$dest = 'enterprise/8/debug-modular/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
@@ -811,7 +812,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	createRepo($dest, $mod);
 }
 
-if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
+if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) || in_array('composer', $_SERVER['argv'])) {
 	$dest = 'enterprise/9/modular/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
@@ -837,7 +838,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/9/composer2/x86_64', $dest, '*.rpm',         '2', 'x86_64', $deps, $template_comp);
 	$mod .= genDefaults('composer', false, ['2']);
 	createRepo($dest, $mod);
-
+}
+if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
 	$dest = 'enterprise/9/debug-modular/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
@@ -859,7 +861,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
 	createRepo($dest, $mod);
 }
 
-if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv'])) {
+if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv']) || in_array('composer', $_SERVER['argv'])) {
 	$dest = 'enterprise/9/modular/aarch64';
 	echo "Populate $dest\n";
 	cleanup($dest);
@@ -885,7 +887,8 @@ if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/9/composer2/x86_64', $dest, '*noarch.rpm', '2', 'aarch64', $deps, $template_comp);
 	$mod .= genDefaults('composer', false, ['2']);
 	createRepo($dest, $mod);
-
+}
+if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv'])) {
 	$dest = 'enterprise/9/debug-modular/aarch64';
 	echo "Populate $dest\n";
 	cleanup($dest);
diff --git a/mkrepo b/mkrepo
index f2b2be1..ebe6d49 100755
--- a/mkrepo
+++ b/mkrepo
@@ -90,7 +90,7 @@ check=sha256
 if true; then
   cleanoldmeta repodata
   echo "+ Génération repodata (createrepo_c, $check)"
-  createrepo_c --workers 4 		     \
+  createrepo_c --workers 12		     \
                --cachedir $cache 	 \
                --unique-md-filenames \
                --retain-old-md 8     \
@@ -101,7 +101,7 @@ if true; then
 else
   cleanoldmeta repodata
   echo "+ Génération repodata (createrepo, $check)"
-    createrepo --workers 4 		 \
+    createrepo --workers 12 		 \
                --cachedir $cache 	 \
                --checksum $check 	 \
                --unique-md-filenames \
-- 
cgit