summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--buildfct40
-rwxr-xr-xmkmodular31
-rwxr-xr-xmockit6
-rwxr-xr-xpearup8
4 files changed, 71 insertions, 14 deletions
diff --git a/buildfct b/buildfct
index fb99bec..0984d39 100644
--- a/buildfct
+++ b/buildfct
@@ -678,11 +678,15 @@ fi
if [ -f "$1" ]; then
echo -n "$(date +%X) r60 f37 "
mock $quiet --configdir=$mocketc -r fc37xr60 rebuild "$@" && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) r60 el9 "
+ echo -n "$(date +%X) r60 f38 "
+ mock $quiet --configdir=$mocketc -r fc38xr60 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r60 f39 "
+ mock $quiet --configdir=$mocketc -r fc39xr60 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r60 el9 "
mock $quiet --configdir=$mocketc -r el9xr60 rebuild "$@" && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) r60 el8 "
+ echo -n "$(date +%X) r60 el8 "
mock $quiet --configdir=$mocketc -r el8xr60 rebuild "$@" && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) r60 el7 "
+ echo -n "$(date +%X) r60 el7 "
mock $quiet --configdir=$mocketc -r el7x rebuild "$@" && echo " Ok." || echo " Error !"
date +%X
else
@@ -702,11 +706,15 @@ fi
if [ -f "$1" ]; then
echo -n "$(date +%X) r62 f37 "
mock $quiet --configdir=$mocketc -r fc37xr62 rebuild "$@" && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) r62 el9 "
+ echo -n "$(date +%X) r62 f38 "
+ mock $quiet --configdir=$mocketc -r fc38xr62 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r62 f39 "
+ mock $quiet --configdir=$mocketc -r fc39xr62 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r62 el9 "
mock $quiet --configdir=$mocketc -r el9xr62 rebuild "$@" && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) r62 el8 "
+ echo -n "$(date +%X) r62 el8 "
mock $quiet --configdir=$mocketc -r el8xr62 rebuild "$@" && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) r62 el7 "
+ echo -n "$(date +%X) r62 el7 "
mock $quiet --configdir=$mocketc -r el7x rebuild "$@" && echo " Ok." || echo " Error !"
date +%X
else
@@ -726,11 +734,15 @@ fi
if [ -f "$1" ]; then
echo -n "$(date +%X) r72 f37 "
mock $quiet --configdir=$mocketc -r fc37xr72 rebuild "$@" && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) r72 el9 "
+ echo -n "$(date +%X) r72 f38 "
+ mock $quiet --configdir=$mocketc -r fc38xr72 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r72 f39 "
+ mock $quiet --configdir=$mocketc -r fc39xr72 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r72 el9 "
mock $quiet --configdir=$mocketc -r el9xr72 rebuild "$@" && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) r72 el8 "
+ echo -n "$(date +%X) r72 el8 "
mock $quiet --configdir=$mocketc -r el8xr72 rebuild "$@" && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) r72 el7 "
+ echo -n "$(date +%X) r72 el7 "
mock $quiet --configdir=$mocketc -r el7x rebuild "$@" && echo " Ok." || echo " Error !"
date +%X
else
@@ -750,11 +762,15 @@ fi
if [ -f "$1" ]; then
echo -n "$(date +%X) r70 f37 "
mock $quiet --configdir=$mocketc -r fc37xr70 rebuild "$@" && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) r70 el9 "
+ echo -n "$(date +%X) r70 f38 "
+ mock $quiet --configdir=$mocketc -r fc38xr70 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r70 f39 "
+ mock $quiet --configdir=$mocketc -r fc39xr70 rebuild "$@" && echo " Ok." || echo " Error !"
+ echo -n "$(date +%X) r70 el9 "
mock $quiet --configdir=$mocketc -r el9xr70 rebuild "$@" && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) r70 el8 "
+ echo -n "$(date +%X) r70 el8 "
mock $quiet --configdir=$mocketc -r el8xr70 rebuild "$@" && echo " Ok." || echo " Error !"
- echo -n "$(date +%X) r70 el7 "
+ echo -n "$(date +%X) r70 el7 "
mock $quiet --configdir=$mocketc -r el7x rebuild "$@" && echo " Ok." || echo " Error !"
date +%X
else
diff --git a/mkmodular b/mkmodular
index aa45ed1..1056f45 100755
--- a/mkmodular
+++ b/mkmodular
@@ -1001,6 +1001,37 @@ if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv'])) {
createRepo($dest, $mod);
}
+if (in_array('el9a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+ $dest = 'enterprise/9/modular-test/aarch64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'el9'];
+ $mod .= genModule('enterprise/9/test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+ $mod .= genModule('enterprise/9/test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+ $mod .= genModule('enterprise/9/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+ $mod .= genModule('enterprise/9/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
+ $mod .= genModule('enterprise/9/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+
+ $deps = ['platform' => 'el9', 'php' => ''];
+ $mod .= genModule('enterprise/9/composer2-test/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp);
+ createRepo($dest, $mod);
+
+ $dest = 'enterprise/9/debug-modular-test/x86_64';
+ echo "Populate $dest\n";
+ cleanup($dest);
+ $mod = '';
+
+ $deps = ['platform' => 'el9'];
+ $mod .= genModule('enterprise/9/debug-test74/aarch64', $dest, '*.rpm', '7.4', 'aarch64', $deps, $template_php);
+ $mod .= genModule('enterprise/9/debug-test80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php);
+ $mod .= genModule('enterprise/9/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
+ $mod .= genModule('enterprise/9/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
+ $mod .= genModule('enterprise/9/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+ createRepo($dest, $mod);
+}
+
if (count($_SERVER['argv']) > 1 && in_array('epel', $_SERVER['argv'])) {
$dest = 'temp/epel-8-modular';
echo "Populate $dest\n";
diff --git a/mockit b/mockit
index 5bdd78d..981f067 100755
--- a/mockit
+++ b/mockit
@@ -35,11 +35,15 @@ else
fi
mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
+srpmdir=/home/rpmbuild/site/rpms
-if [ ! -f $SRPM ]; then
+if [ -f $srpmdir/$SRPM ]; then
+ SRPM=$srpmdir/$SRPM
+elif [ ! -f $SRPM ]; then
echo "file not found '$SRPM'"
exit 1
fi
+
echo mockit $SRPM $DIST $MIN $MAX $@
case $DIST in
fc37x|fc38x|fc39x|el9x)
diff --git a/pearup b/pearup
index 85c913f..b4a023c 100755
--- a/pearup
+++ b/pearup
@@ -5,7 +5,7 @@ rpmdate=$(LC_ALL="C" date +"%a %b %d %Y")
rpmdate=${rpmdate/ 0/ }
if [ $# -lt 2 ]; then
- echo "usage $0 old new [ spec ]"
+ echo "usage $0 old new [ spec ] [ oldsuffix newsuffix ]"
exit 1
fi
if [ -n "$3" ]; then
@@ -14,6 +14,12 @@ else
name=$(basename $PWD).spec
fi
+if [ ! -f $3 ]; then
+ echo "cannot read '$3' spec file"
+ echo "usage $0 old new [ spec ] [ oldsuffix newsuffix ]"
+ exit 1
+fi
+
oldver="$1"
newver="$2"
rpmver="$2"