F38 helpers

4 files changed, 100 insertions, 9 deletions

diff --git a/buildfct b/buildfct
index b6d1d09..b46381d 100644
--- a/buildfct
+++ b/buildfct
@@ -72,6 +72,23 @@ alias mockfc37xr62="             mock --configdir=$mocketc -r fc37xr62
 alias mockfc37xr70="             mock --configdir=$mocketc -r fc37xr70            rebuild "
 alias mockfc37xm="               mock --configdir=$mocketc -r fc37xm              rebuild "
 
+alias mockfc38i="  setarch i686  mock --configdir=$mocketc -r fc38i   --arch i686 rebuild "
+alias mockfc38x="                mock --configdir=$mocketc -r fc38x               rebuild "
+alias mockfc38xd="               mock --configdir=$mocketc -r fc38xd              rebuild "
+alias mockfc38xr="               mock --configdir=$mocketc -r fc38xr              rebuild "
+alias mockfc38x74="              mock --configdir=$mocketc -r fc38x74             rebuild "
+alias mockfc38x80="              mock --configdir=$mocketc -r fc38x80             rebuild "
+alias mockfc38x81="              mock --configdir=$mocketc -r fc38x81             rebuild "
+alias mockfc38x82="              mock --configdir=$mocketc -r fc38x82             rebuild "
+alias mockfc38xscl74="           mock --configdir=$mocketc -r fc38xscl74          rebuild "
+alias mockfc38xscl80="           mock --configdir=$mocketc -r fc38xscl80          rebuild "
+alias mockfc38xscl81="           mock --configdir=$mocketc -r fc38xscl81          rebuild "
+alias mockfc38xscl82="           mock --configdir=$mocketc -r fc38xscl82          rebuild "
+alias mockfc38xr60="             mock --configdir=$mocketc -r fc38xr60            rebuild "
+alias mockfc38xr62="             mock --configdir=$mocketc -r fc38xr62            rebuild "
+alias mockfc38xr70="             mock --configdir=$mocketc -r fc38xr70            rebuild "
+alias mockfc38xm="               mock --configdir=$mocketc -r fc38xm              rebuild "
+
 alias mockel6i="  setarch i686 mock --configdir=$mocketc -r el6i   --arch i686 rebuild "
 alias mockel6it=" setarch i686 mock --configdir=$mocketc -r el6it  --arch i686 rebuild "
 alias mockel6i55="setarch i686 mock --configdir=$mocketc -r el6i55 --arch i686 rebuild "
@@ -266,10 +283,10 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 37 36
+  for i in 38 37 36
   do
     echo -n ""
-    (mock $quiet --configdir=$mocketc -r fc${i}x   rebuild "$@" && echo "$(date +%X) (7x) fc$i  Ok." || echo "fc$1 Error !")&
+    (mock $quiet --configdir=$mocketc -r fc${i}x   rebuild "$@" && echo "$(date +%X) (8x) fc$i  Ok." || echo "fc$1 Error !")&
     pids="$pids $!"
   done
     echo -n ""
@@ -300,6 +317,9 @@ if [ -f "$1" ]; then
   date +%X
   pids=""
     echo -n ""
+    (mock $quiet --configdir=$mocketc -r fc38x     rebuild "$@" && echo "$(date +%X) (82) fc38  Ok." || echo "fc38 Error !")&
+    pids="$pids $!"
+    echo -n ""
     (mock $quiet --configdir=$mocketc -r fc36x     rebuild "$@" && echo "$(date +%X) (81) fc36  Ok." || echo "fc36 Error !")&
     pids="$pids $!"
     echo -n ""
@@ -478,7 +498,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 37 36
+  for i in 37 36 38
   do
     echo -n "$(date +%X) 74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -608,7 +628,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 37 36
+  for i in 37 36 38
   do
     echo -n "$(date +%X) 82 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -634,7 +654,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 37 36
+  for i in 37 36 38
   do
     echo -n "$(date +%X) 81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -660,7 +680,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 37 36
+  for i in 37 36 38
   do
     echo -n "$(date +%X) 80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index bd68e04..ac369ea 100755
--- a/getmock
+++ b/getmock
@@ -443,6 +443,7 @@ elif [ $1 = all74 ]; then
 	[ $opt = test ] && opt=test74
 		getOneMock fc36x74 $opt '*7.4*'
 		getOneMock fc37x74 $opt '*7.4*'
+		getOneMock fc38x74 $opt '*7.4*'
 		getOneMock el7x74  $opt '*7.4*'
 		getOneMock el8x74  $opt '*7.4*'
 		getOneMock el9x74  $opt '*7.4*'
@@ -453,6 +454,7 @@ elif [ $1 = all80 ]; then
 	[ $opt = test ] && opt=test80
 		getOneMock fc36x80 $opt '*8.0*'
 		getOneMock fc37x80 $opt '*8.0*'
+		getOneMock fc38x80 $opt '*8.0*'
 		getOneMock el7x80  $opt '*8.0*'
 		getOneMock el8x80  $opt '*8.0*'
 		getOneMock el9x80  $opt '*8.0*'
@@ -463,6 +465,7 @@ elif [ $1 = all81 ]; then
 	[ $opt = test ] && opt=test81
 		getOneMock fc36x81 $opt '*8.1*'
 		getOneMock fc37x81 $opt '*8.1*'
+		getOneMock fc38x81 $opt '*8.1*'
 		getOneMock el7x81  $opt '*8.1*'
 		getOneMock el8x81  $opt '*8.1*'
 		getOneMock el9x81  $opt '*8.1*'
@@ -473,6 +476,7 @@ elif [ $1 = all82 ]; then
 	[ $opt = test ] && opt=test82
 		getOneMock fc36x82 $opt '*8.2*'
 		getOneMock fc37x82 $opt '*8.2*'
+		getOneMock fc38x82 $opt '*8.2*'
 		getOneMock el7x82  $opt '*8.2*'
 		getOneMock el8x82  $opt '*8.2*'
 		getOneMock el9x82  $opt '*8.2*'
@@ -484,6 +488,7 @@ elif [ $1 = allr60 ]; then
 	opt=redis60
 	getOneMock fc36x $opt '*6.0*'
 	getOneMock fc37x $opt '*6.0*'
+	getOneMock fc38x $opt '*6.0*'
 	getOneMock el8x  $opt '*6.0*'
 	getOneMock el9x  $opt '*6.0*'
 	getOneMock el9a  $opt '*6.0*'
@@ -494,6 +499,7 @@ elif [ $1 = allr62 ]; then
 	opt=redis62
 	getOneMock fc36x $opt '*6.2*'
 	getOneMock fc37x $opt '*6.2*'
+	getOneMock fc38x $opt '*6.2*'
 	getOneMock el8x  $opt '*6.2*'
 	getOneMock el9x  $opt '*6.2*'
 	getOneMock el9a  $opt '*6.2*'
@@ -504,6 +510,7 @@ elif [ $1 = allr70 ]; then
 	opt=redis70
 	getOneMock fc36x $opt '*7.0*'
 	getOneMock fc37x $opt '*7.0*'
+	getOneMock fc38x $opt '*7.0*'
 	getOneMock el8x  $opt '*7.0*'
 	getOneMock el9x  $opt '*7.0*'
 	getOneMock el9a  $opt '*7.0*'
@@ -515,6 +522,7 @@ elif [ $1 = allm ]; then
 	opt=memcached
 	getOneMock fc36x $opt '*1.6*'
 	getOneMock fc37x $opt '*1.6*'
+	getOneMock fc38x $opt '*1.6*'
 	getOneMock el9x  $opt '*1.6*'
 	getOneMock el9a  $opt '*1.6*'
 
@@ -535,7 +543,7 @@ elif [ $1 = for55 ]; then
 	done
 
 elif [ $1 = allx ]; then
-	for i in 36 37
+	for i in 36 37 38
 	do
 		getOneMock fc${i}x $opt
 	done
diff --git a/mkallrepo b/mkallrepo
index 0f76a8b..016616d 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -10,7 +10,7 @@ TMPSIG2023=$(mktemp -t XXXXXXXX.2023)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{34,35,36,37}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{34,35,36,37,38}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
@@ -52,6 +52,7 @@ if [ -s $TMPSIG ]; then
     grep fc37    $TMPSIG >> $TMPSIG2022
 	# 2023
     grep src.rpm $TMPSIG  > $TMPSIG2023
+    grep fc38    $TMPSIG >> $TMPSIG2023
 
     if [ -s $TMPSIG2023 ]; then
 		echo "== Signature des $(cat $TMPSIG2023 | wc -l) nouveaux RPM (2023) =="
@@ -106,7 +107,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{34,35,36,37}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{34,35,36,37,38}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
diff --git a/mkmodular b/mkmodular
index 839466c..2fd1a5e 100755
--- a/mkmodular
+++ b/mkmodular
@@ -629,6 +629,68 @@ if (in_array('f37', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	createRepo($dest, $mod);
 }
 
+if (count($_SERVER['argv']) < 2 || in_array('f38', $_SERVER['argv'])) {
+	$dest = 'fedora/38/modular/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f38'];
+	$mod .= genModule('fedora/38/php74/x86_64',  $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/38/php80/x86_64',  $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/38/php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/38/php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2']);
+	$mod .= genModule('fedora/38/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
+	$mod .= genModule('fedora/38/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
+	$mod .= genModule('fedora/38/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
+	$mod .= genDefaults('redis', false, ['remi-6.0', 'remi-6.2', 'remi-7.0']);
+	$mod .= genModule('fedora/38/memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
+	$mod .= genDefaults('memcached', false, ['remi']);
+	createRepo($dest, $mod);
+
+	$dest = 'fedora/38/debug-modular/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f38'];
+	$mod .= genModule('fedora/38/debug-php74/x86_64',  $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/38/debug-php80/x86_64',  $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/38/debug-php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/38/debug-php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/38/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
+	$mod .= genModule('fedora/38/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
+	$mod .= genModule('fedora/38/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
+	$mod .= genModule('fedora/38/debug-memcached/x86_64',$dest, '*.rpm', false, 'x86_64', $deps, $template_memcached);
+	createRepo($dest, $mod);
+}
+if (in_array('f38', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+	$dest = 'fedora/38/modular-test/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f38'];
+	$mod .= genModule('fedora/38/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/38/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/38/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/38/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+	createRepo($dest, $mod);
+
+	$dest = 'fedora/38/debug-modular-test/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f38'];
+	$mod .= genModule('fedora/38/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/38/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/38/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/38/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
+	createRepo($dest, $mod);
+}
+
 if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$dest = 'enterprise/8/modular-test/x86_64';
 	echo "Populate $dest\n";