From 920bbe30e99ce841b96fbe8774421bf379e9bc62 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 18 Oct 2022 17:57:29 +0200
Subject: [PATCH] fedora 37

---
 Makefile          |  2 +-
 create-vm.sh      |  2 +-
 fedora-mirror.sh  |  4 ++--
 lbuild-nightly.sh |  2 +-
 lxc.mk            | 14 +++++++-------
 pkgs.py           |  4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 33318918..ad95581a 100644
--- a/Makefile
+++ b/Makefile
@@ -348,7 +348,7 @@ header.spec:
 	echo "%global _source_filedigest_algorithm 1" >> $@
 	echo "%global _source_payload       w9.gzdio" >> $@
 	echo "%global _binary_payload       w9.gzdio" >> $@
-ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29 f31 f33 f35)"
+ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29 f31 f33 f35 f37)"
 	echo "%define debug_package %{nil}" >> $@
 endif
 
diff --git a/create-vm.sh b/create-vm.sh
index da3de79c..c358cb56 100755
--- a/create-vm.sh
+++ b/create-vm.sh
@@ -28,7 +28,7 @@ LOGS=$HOME/machines
 
 DOMAIN=pl.sophia.inria.fr
 
-DEFAULT_DISTRO=f35
+DEFAULT_DISTRO=f37
 DEFAULT_MEMORY=16384
 
 CONFIRM=
diff --git a/fedora-mirror.sh b/fedora-mirror.sh
index 5d50c32a..6ff5b6a3 100755
--- a/fedora-mirror.sh
+++ b/fedora-mirror.sh
@@ -16,8 +16,8 @@ root=/mirror/
 us_fedora_url=rsync://mirrors.kernel.org/fedora
 eu_fedora_url=rsync://mirror1.hs-esslingen.de/fedora/linux
 
-default_distroname="f35"
-all_distronames="f33 f35"
+default_distroname="f37"
+all_distronames="f35 f37"
 
 global_arch="x86_64"
 
diff --git a/lbuild-nightly.sh b/lbuild-nightly.sh
index c60677e1..95a87bdf 100755
--- a/lbuild-nightly.sh
+++ b/lbuild-nightly.sh
@@ -11,7 +11,7 @@ COMMAND=$(basename $0)
 export PATH=$PATH:/bin:/sbin
 
 # default values, tunable with command-line options
-DEFAULT_FCDISTRO=f35
+DEFAULT_FCDISTRO=f37
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
 DEFAULT_MAILDEST="build at onelab.eu"
diff --git a/lxc.mk b/lxc.mk
index bc1a16d7..699ead40 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -11,7 +11,7 @@
 
 
 ### starting with f31 : serverside-only
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35 f37)"
 ###
 
 
@@ -32,7 +32,7 @@ IN_NODEIMAGE += lxc-userspace
 # with 4.19, the jprobe api has gone entirely
 # https://github.com/torvalds/linux/commit/4de58696de076d9bd2745d1cbe0930635c3f5ac9
 #
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35 f37)"
 #
 transforward-MODULES := transforward
 transforward-SPEC := transforward.spec
@@ -189,7 +189,7 @@ ALL += bind_public
 
 # in fedora 29, this triggers nasty-looking compile messages
 # not trying too hard, we're mostly after the serverside of f29 and above
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35 f37)"
 #
 # sliver-openvswitch
 #
@@ -268,7 +268,7 @@ endif
 
 
 ### serverside-only
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35 f37)"
 ### serverside-only
 
 
@@ -430,9 +430,9 @@ ALL += release
 # so, let's keep this out of the way for now
 # 2019 mar 27: reinstating for hopefully connecting fed4fire
 # 2022 apr 28:
-# we currently run on r2labapi.inria.fr a hybrid f33/f34/f35
-# that has python2 (recipe from f33) + php-7.4 (from f34) and httpd-2.4.53 (from f35)
-# and we'll hold to that until end of june 2022
+# last time we were running sfa it was on r2labapi.inria.fr with a hybrid f33/f34/f35
+# that had python2 (recipe from f33) + php-7.4 (from f34) and httpd-2.4.53 (from f35)
+# and we've held to that until end of june 2022
 # however the python2 ecosystem is too far-fetched now
 # so we're dropping for good support for sfa, last version is f33
 #
diff --git a/pkgs.py b/pkgs.py
index bc8195a6..79de87ff 100755
--- a/pkgs.py
+++ b/pkgs.py
@@ -36,7 +36,7 @@ import re
 
 default_arch = 'x86_64'
 known_archs = ['i386', 'i686', 'x86_64']
-default_fcdistro = 'f35'
+default_fcdistro = 'f37'
 known_fcdistros = [
     'centos5', 'centos6',
     # oldies but we have references to that in the pkgs files
@@ -45,7 +45,7 @@ known_fcdistros = [
     # these ones are still relevant;
     # f32 is mentioned to be able to use create-vms with that distro
     # as we're running into issues to build a minimal f33 from a f29 host
-    'f29', 'f31', 'f32', 'f33', 'f35',
+    'f29', 'f31', 'f32', 'f33', 'f35', 'f37',
     # scientific linux
     'sl6',
     # debians
-- 
2.43.0