EL-9 helpers

5 files changed, 80 insertions, 11 deletions

diff --git a/buildfct b/buildfct
index 86917db..65c4eef 100644
--- a/buildfct
+++ b/buildfct
@@ -128,6 +128,14 @@ alias mockel8xscl74="          mock --configdir=$mocketc -r el8xscl74          r
 alias mockel8xscl80="          mock --configdir=$mocketc -r el8xscl80          rebuild "
 alias mockel8xscl81="          mock --configdir=$mocketc -r el8xscl81          rebuild "
 
+alias mockel9x="               mock --configdir=$mocketc -r el9x               rebuild "
+alias mockel9xr="              mock --configdir=$mocketc -r el9xr              rebuild "
+alias mockel9n="               mock --configdir=$mocketc -r el9n               rebuild "
+alias mockel9x80="             mock --configdir=$mocketc -r el9x80             rebuild "
+alias mockel9x81="             mock --configdir=$mocketc -r el9x81             rebuild "
+alias mockel9xscl80="          mock --configdir=$mocketc -r el9xscl80          rebuild "
+alias mockel9xscl81="          mock --configdir=$mocketc -r el9xscl81          rebuild "
+
 alias mockepel872="            mock --configdir=$mocketc -r epel872            rebuild "
 alias mockepel873="            mock --configdir=$mocketc -r epel873            rebuild "
 alias mockepel874="            mock --configdir=$mocketc -r epel874            rebuild "
@@ -274,7 +282,10 @@ if [ -f "$1" ]; then
     pids="$pids $!"
   done
     echo -n ""
-    (mock $quiet --configdir=$mocketc -r el8x      rebuild "$@" && echo "$(date +%X) (73) el8   Ok." || echo "el8  Error !")&
+    (mock $quiet --configdir=$mocketc -r el8x      rebuild "$@" && echo "$(date +%X) (74) el8   Ok." || echo "el8  Error !")&
+    pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el9x      rebuild "$@" && echo "$(date +%X) (80) el9   Ok." || echo "el9  Error !")&
     pids="$pids $!"
   wait $pids
   date +%X
@@ -303,11 +314,14 @@ if [ -f "$1" ]; then
   for i in 7
   do
     echo -n ""
-    (mock $quiet --configdir=$mocketc -r el${i}x74 rebuild "$@" && echo "$(date +%X) (73) el$i   Ok." || echo "el$i  Error !")&
+    (mock $quiet --configdir=$mocketc -r el${i}x74 rebuild "$@" && echo "$(date +%X) (74) el$i   Ok." || echo "el$i  Error !")&
     pids="$pids $!"
   done
     echo -n ""
-    (mock $quiet --configdir=$mocketc -r el8x      rebuild "$@" && echo "$(date +%X) (73) el8   Ok." || echo "el8  Error !")&
+    (mock $quiet --configdir=$mocketc -r el8x      rebuild "$@" && echo "$(date +%X) (74) el8   Ok." || echo "el8  Error !")&
+    pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el9x      rebuild "$@" && echo "$(date +%X) (80) el9   Ok." || echo "el9  Error !")&
     pids="$pids $!"
   wait $pids
   date +%X
@@ -525,7 +539,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) 81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 8 7
+  for i in 8 9 7
   do
     echo -n "$(date +%X) 81 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x81 rebuild "$@"&& echo " Ok." || echo " Error !"
@@ -551,7 +565,7 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) 80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 8 7
+  for i in 9 8 7
   do
     echo -n "$(date +%X) 80 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}x80 rebuild "$@"&& echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index 5292e0a..33539b2 100755
--- a/getmock
+++ b/getmock
@@ -85,6 +85,16 @@ el8x80)
 	fi
 	type=enterprise
 	;;
+el9x80)
+	dep=9
+    if [ "$2" == "php80" -o "$2" == "test80" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php80
+	else	rep=${2}80
+	fi
+	type=enterprise
+	;;
 el8x81)
 	dep=8
     if [ "$2" == "php81" -o "$2" == "test81" ]
@@ -95,6 +105,16 @@ el8x81)
 	fi
 	type=enterprise
 	;;
+el9x81)
+	dep=9
+    if [ "$2" == "php81" -o "$2" == "test81" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php81
+	else	rep=${2}81
+	fi
+	type=enterprise
+	;;
 el*)	dep=${dep#el}
 	type=enterprise
 	;;
@@ -325,6 +345,7 @@ elif [ $1 = all80 ]; then
 		getOneMock fc34x   $opt '*8.0*'
 		getOneMock el7x    $opt '*8.0*'
 		getOneMock el8x80  $opt '*8.0*'
+		getOneMock el9x80  $opt '*8.0*'
 
 elif [ $1 = all81 ]; then
 	[ $opt = remi ] && opt=php81
@@ -334,6 +355,7 @@ elif [ $1 = all81 ]; then
 		getOneMock fc35x   $opt '*8.1*'
 		getOneMock el7x    $opt '*8.1*'
 		getOneMock el8x81  $opt '*8.1*'
+		getOneMock el9x81  $opt '*8.1*'
 
 elif [ $1 = all54 ]; then
 	n=7
@@ -356,7 +378,7 @@ elif [ $1 = allx ]; then
 	do
 		getOneMock fc${i}x $opt
 	done
-	for i in 7 8
+	for i in 7 8 9
 	do
 		getOneMock el${i}x $opt
 	done
diff --git a/mkallrepo b/mkallrepo
index bcd6bb5..b76ea02 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -10,7 +10,7 @@ TMPSIG2021=$(mktemp -t XXXXXXXX.2021)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{33,34,35}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{33,34,35}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 
@@ -49,6 +49,7 @@ if [ -s $TMPSIG ]; then
 	# 2021
     grep fc34    $TMPSIG  > $TMPSIG2021
     grep fc35    $TMPSIG >> $TMPSIG2021
+    grep el9     $TMPSIG >> $TMPSIG2021
     grep src.rpm $TMPSIG >> $TMPSIG2021
 
     if [ -s $TMPSIG2021 ]; then
@@ -104,7 +105,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{33,34,35}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{33,34,35}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 
diff --git a/mkmodular b/mkmodular
index 495cfea..c12347e 100755
--- a/mkmodular
+++ b/mkmodular
@@ -339,7 +339,9 @@ if ($dis == "fedora") {
 		$GPG_PATH="/home/remi/.gnupg2019";
 	}
 } else {
-	if ($ver >= 8) {
+	if ($ver >= 9) {
+		$GPG_PATH="/home/remi/.gnupg2021";
+	} else if ($ver == 8) {
 		$GPG_PATH="/home/remi/.gnupg2018";
 	} else {
 		$GPG_PATH="/home/remi/.gnupgrpm";
@@ -513,6 +515,33 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
 	createRepo($dest, $mod);
 }
 
+if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+	$dest = 'enterprise/9/modular-test/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$deps = ['platform' => 'el9'];
+	$mod .= genModule('enterprise/9/test80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/9/test81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
+	createRepo($dest, $mod);
+}
+if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
+	$dest = 'enterprise/9/modular/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$deps = ['platform' => 'el9'];
+	$mod .= genModule('enterprise/9/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/9/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-8.0', 'remi-8.1']);
+	$deps = ['platform' => 'el9'];
+	$mod .= genModule('enterprise/9/redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis);
+	$mod .= genDefaults('redis', false, ['remi-6.2']);
+	$deps = ['platform' => 'el9', 'php' => ''];
+	$mod .= genModule('enterprise/9/composer2/x86_64', $dest, '*.rpm',         '2', 'x86_64', $deps, $template_comp);
+	$mod .= genDefaults('composer', '2', ['2']);
+	createRepo($dest, $mod);
+}
+
+
 if (count($_SERVER['argv']) > 1 && in_array('epel', $_SERVER['argv'])) {
 	$dest = 'temp/epel-8-modular';
 	echo "Populate $dest\n";
@@ -554,7 +583,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) {
 	$mod .= genDefaults('php', '7.2', ['remi-7.1', 'remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1']);
 	$mod .= genModule('enterprise/7/remi/x86_64',  $dest, 'redis*5.0*.rpm', '5.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/7/remi/x86_64',  $dest, 'redis*6.0*.rpm', '6.0', 'x86_64', $deps, $template_redis);
-	$mod .= genModule('enterprise/7/remi/x86_64',  $dest, 'redis*6.2*.rpm', '6.0', 'x86_64', $deps, $template_redis);
+	$mod .= genModule('enterprise/7/remi/x86_64',  $dest, 'redis*6.2*.rpm', '6.2', 'x86_64', $deps, $template_redis);
 	$mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2']);
 	$deps = ['platform' => 'el7', 'php' => ''];
 	$mod .= genModule('enterprise/7/glpi92/x86_64', $dest, '*.rpm',         '9.2', 'x86_64', $deps, $template_glpi);
diff --git a/mkrepo b/mkrepo
index 93e946e..4ca6bce 100755
--- a/mkrepo
+++ b/mkrepo
@@ -40,7 +40,10 @@ if [ "$dis" == "fedora" ]; then
 	fi
 else
 	# Enterprise
-	if [ "$dis" == "enterprise" -a "$ver" -ge 8 ]
+	if [ "$ver" -ge 9 ]
+	then echo "key 2021"
+		GPG_PATH=/home/remi/.gnupg2021
+	elif [ "$ver" -ge 8 ]
 	then echo "key 2018"
 		GPG_PATH=/home/remi/.gnupg2018
 	else echo "old key"