From 9a6d74a13baad36bde3f46154b03e8a3d45494eb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Jun 2023 17:48:27 +0200 Subject: mkmodular: new filters for 7.1, 7.2 and 7.3 only updates --- mkmodular | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mkmodular b/mkmodular index 57b30c3..207c133 100755 --- a/mkmodular +++ b/mkmodular @@ -731,7 +731,9 @@ 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']) || in_array('composer', $_SERVER['argv'])) { +if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) + || in_array('noarch', $_SERVER['argv']) + || in_array('7.3', $_SERVER['argv']) || in_array('7.2', $_SERVER['argv'])) { $dest = 'enterprise/8/modular/x86_64'; echo "Populate $dest\n"; cleanup($dest); @@ -760,7 +762,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genDefaults('composer', '2', ['1', '2']); 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('7.3', $_SERVER['argv']) || in_array('7.2', $_SERVER['argv'])) { $dest = 'enterprise/8/debug-modular/x86_64'; echo "Populate $dest\n"; cleanup($dest); @@ -812,7 +815,8 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { createRepo($dest, $mod); } -if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) || in_array('composer', $_SERVER['argv'])) { +if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) + || in_array('noarch', $_SERVER['argv'])) { $dest = 'enterprise/9/modular/x86_64'; echo "Populate $dest\n"; cleanup($dest); @@ -861,7 +865,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { createRepo($dest, $mod); } -if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv']) || in_array('composer', $_SERVER['argv'])) { +if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv']) + || in_array('noarch', $_SERVER['argv'])) { $dest = 'enterprise/9/modular/aarch64'; echo "Populate $dest\n"; cleanup($dest); @@ -942,7 +947,8 @@ if (in_array('el7', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/7/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } -if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) { +if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv']) + || in_array('7.3', $_SERVER['argv']) || in_array('7.2', $_SERVER['argv']) || in_array('7.1', $_SERVER['argv'])) { $dest = 'enterprise/7/modular/x86_64'; echo "Populate $dest\n"; cleanup($dest); -- cgit