summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-03-01 16:05:16 +0100
committerRemi Collet <remi@remirepo.net>2019-03-01 16:05:16 +0100
commit06a3bf4a210d3833e19ec015d47cb3434dd32640 (patch)
treec9a9b7334a8aad9acce4db0d136d98e931b205bb
parenta63597b97185e29a6ec7578a344f1227c7cbffce (diff)
+f30 modular repo
-rwxr-xr-xmkmodular50
1 files changed, 46 insertions, 4 deletions
diff --git a/mkmodular b/mkmodular
index 75bfad4..ec672aa 100755
--- a/mkmodular
+++ b/mkmodular
@@ -188,8 +188,11 @@ function findPackages($from, $dest, $pat) {
$name = basename($file);
if (!file_exists("$dest/$name")) {
if (link($file, "$dest/$name")) {
- if (!in_array(basename($file), $oldrpms)) {
- printf("\r+ %-70s\n", basename($file));
+ $k = array_search(basename($file), $oldrpms);
+ if ($k === false) {
+ printf("\r\t+ %-70s\n", basename($file));
+ } else {
+ unset($oldrpms[$k]);
}
}
}
@@ -247,7 +250,7 @@ chdir(__DIR__);
}
-if (count($_SERVER['argv'])<2 || in_array('f29', $_SERVER['argv'])) {
+if (count($_SERVER['argv']) < 2 || in_array('f29', $_SERVER['argv'])) {
$dest = 'fedora/29/modular/x86_64';
echo "Populate $dest\n";
cleanup($dest);
@@ -291,7 +294,45 @@ if (count($_SERVER['argv'])<2 || in_array('f29', $_SERVER['argv'])) {
createRepo($dest, $mod);
}
-if (count($_SERVER['argv'])<2 || in_array('el8', $_SERVER['argv'])) {
+if (count($_SERVER['argv']) < 2 || in_array('f30', $_SERVER['argv'])) {
+ $dest = 'fedora/30/modular/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $deps = ['platform' => 'f30'];
+ $mod = genModule('fedora/30/remi/x86_64', $dest, 'php-*7.3*.rpm', '7.3', 'x86_64', $deps, $template_php);
+ $mod .= genModule('fedora/30/glpi93/x86_64', $dest, '*.rpm', '9.3', 'x86_64', $deps, $template_glpi);
+ $mod .= genModule('fedora/30/glpi94/x86_64', $dest, '*.rpm', '9.4', 'x86_64', $deps, $template_glpi);
+ $mod .= $defaults;
+ createRepo($dest, $mod);
+
+ $dest = 'fedora/30/modular-test/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $deps = ['platform' => 'f30'];
+ $mod = genModule('fedora/30/test/x86_64', $dest, 'php-*7.3*.rpm', '7.3', 'x86_64', $deps, $template_php);
+ $mod .= $defaults;
+ createRepo($dest, $mod);
+
+ $dest = 'fedora/30/modular/i386';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $deps = ['platform' => 'f30'];
+ $mod = genModule('fedora/30/remi/i386', $dest, 'php-*7.3*.rpm', '7.3', 'i386', $deps, $template_php);
+ $mod .= genModule('fedora/30/glpi93/i386', $dest, '*.rpm', '9.3', 'i386', $deps, $template_glpi);
+ $mod .= genModule('fedora/30/glpi94/i386', $dest, '*.rpm', '9.4', 'i386', $deps, $template_glpi);
+ $mod .= $defaults;
+ createRepo($dest, $mod);
+
+ $dest = 'fedora/30/modular-test/i386';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $deps = ['platform' => 'f30'];
+ $mod = genModule('fedora/30/test/i386', $dest, 'php-*7.3*.rpm', '7.3', 'i386', $deps, $template_php);
+ $mod .= $defaults;
+ createRepo($dest, $mod);
+}
+
+if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
$dest = 'enterprise/8/modular-test/x86_64';
echo "Populate $dest\n";
cleanup($dest);
@@ -314,3 +355,4 @@ if (count($_SERVER['argv'])<2 || in_array('el8', $_SERVER['argv'])) {
$mod .= $defaults;
createRepo($dest, $mod);
}
+echo "Done\n";