summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xgetmock10
-rwxr-xr-xmkmodular12
2 files changed, 16 insertions, 6 deletions
diff --git a/getmock b/getmock
index 38e8bf8..103b2ad 100755
--- a/getmock
+++ b/getmock
@@ -472,6 +472,7 @@ elif [ $1 = all74 ]; then
getOneMock fc39x74 $opt '*7.4*'
getOneMock el7x74 $opt '*7.4*'
getOneMock el8x74 $opt '*7.4*'
+ getOneMock el8a74 $opt '*7.4*'
getOneMock el9x74 $opt '*7.4*'
getOneMock el9a74 $opt '*7.4*'
@@ -483,6 +484,7 @@ elif [ $1 = all80 ]; then
getOneMock fc39x80 $opt '*8.0*'
getOneMock el7x80 $opt '*8.0*'
getOneMock el8x80 $opt '*8.0*'
+ getOneMock el8a80 $opt '*8.0*'
getOneMock el9x80 $opt '*8.0*'
getOneMock el9a80 $opt '*8.0*'
@@ -494,6 +496,7 @@ elif [ $1 = all81 ]; then
getOneMock fc39x81 $opt '*8.1*'
getOneMock el7x81 $opt '*8.1*'
getOneMock el8x81 $opt '*8.1*'
+ getOneMock el8a81 $opt '*8.1*'
getOneMock el9x81 $opt '*8.1*'
getOneMock el9a81 $opt '*8.1*'
@@ -505,6 +508,7 @@ elif [ $1 = all82 ]; then
getOneMock fc39x82 $opt '*8.2*'
getOneMock el7x82 $opt '*8.2*'
getOneMock el8x82 $opt '*8.2*'
+ getOneMock el8a82 $opt '*8.2*'
getOneMock el9x82 $opt '*8.2*'
getOneMock el9a82 $opt '*8.2*'
@@ -516,6 +520,7 @@ elif [ $1 = all83 ]; then
getOneMock fc39x83 $opt '*8.3*'
getOneMock el7x83 $opt '*8.3*'
getOneMock el8x83 $opt '*8.3*'
+ getOneMock el8a83 $opt '*8.3*'
getOneMock el9x83 $opt '*8.3*'
getOneMock el9a83 $opt '*8.3*'
@@ -660,6 +665,7 @@ elif [ $1 = scl82 ]; then
do
getOneMock scl82el${i}x $opt
done
+ getOneMock scl82el8a $opt
getOneMock scl82el9a $opt
elif [ $1 = scl83 ]; then
@@ -667,6 +673,7 @@ elif [ $1 = scl83 ]; then
do
getOneMock scl83${i}x $opt
done
+ getOneMock scl83el8a $opt
getOneMock scl83el9a $opt
elif [ $1 = scl81 ]; then
@@ -678,6 +685,7 @@ elif [ $1 = scl81 ]; then
do
getOneMock scl81el${i}x $opt
done
+ getOneMock scl81el8a $opt
getOneMock scl81el9a $opt
elif [ $1 = scl80 ]; then
@@ -689,6 +697,7 @@ elif [ $1 = scl80 ]; then
do
getOneMock scl80el${i}x $opt
done
+ getOneMock scl80el8a $opt
getOneMock scl80el9a $opt
elif [ $1 = scl74 ]; then
@@ -700,6 +709,7 @@ elif [ $1 = scl74 ]; then
do
getOneMock scl74el${i}x $opt
done
+ getOneMock scl74el8a $opt
getOneMock scl74el9a $opt
elif [ $1 = scl73 ]; then
diff --git a/mkmodular b/mkmodular
index 8dc09b3..8a8ee1c 100755
--- a/mkmodular
+++ b/mkmodular
@@ -775,7 +775,7 @@ if (in_array('f39', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
createRepo($dest, $mod);
}
-if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+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";
cleanup($dest);
@@ -809,7 +809,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$mod .= genModule('enterprise/8/debug-test83/x86_64', $dest, '*.rpm', '8.3', '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('el8x', $_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';
@@ -841,7 +841,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])
$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('el8x', $_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";
@@ -866,7 +866,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])
createRepo($dest, $mod);
}
-if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+if (in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$dest = 'enterprise/8/modular-test/aarch64';
echo "Populate $dest\n";
cleanup($dest);
@@ -896,7 +896,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$mod .= genModule('enterprise/8/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $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('el8a', $_SERVER['argv'])
|| in_array('noarch', $_SERVER['argv'])
|| in_array('7.3', $_SERVER['argv']) || in_array('7.2', $_SERVER['argv'])) {
$dest = 'enterprise/8/modular/aarch64';
@@ -925,7 +925,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])
$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('el8a', $_SERVER['argv'])
|| in_array('7.3', $_SERVER['argv']) || in_array('7.2', $_SERVER['argv'])) {
$dest = 'enterprise/8/debug-modular/aarch64';
echo "Populate $dest\n";