From 1f4f80e0c7dc71ef79614227c195139a56d1421e Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 15 Nov 2019 14:27:59 +0100
Subject: [PATCH] building for f31

---
 Makefile                                   |  2 +-
 create-vm.sh                               |  2 +-
 lbuild-initvm.sh                           |  2 +-
 lbuild-nightly.sh                          |  2 +-
 lxc.mk                                     |  8 ++++----
 mirroring/f31/yum.repos.d/building.repo.in | 23 ++++++++++++++++++++++
 pkgs.py                                    |  8 ++++----
 7 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 mirroring/f31/yum.repos.d/building.repo.in

diff --git a/Makefile b/Makefile
index d8cfefc7..a48654e1 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)"
+ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29 f31)"
 	echo "%define debug_package %{nil}" >> $@
 endif
 
diff --git a/create-vm.sh b/create-vm.sh
index 0b7d7fbb..7027276a 100755
--- a/create-vm.sh
+++ b/create-vm.sh
@@ -11,7 +11,7 @@ LOGS=$HOME/machines
 
 DOMAIN=pl.sophia.inria.fr
 
-DEFAULT_DISTRO=f29
+DEFAULT_DISTRO=f31
 DEFAULT_MEMORY=16384
 
 CONFIRM=
diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 35e4c388..b26375bf 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -30,7 +30,7 @@ function lxcroot () {
 
 # XXX fixme : when creating a 32bits VM we need to call linux32 as appropriate...s
 
-DEFAULT_FCDISTRO=f29
+DEFAULT_FCDISTRO=f31
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
 DEFAULT_MEMORY=3072
diff --git a/lbuild-nightly.sh b/lbuild-nightly.sh
index ac37e699..1d115e9c 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=f29
+DEFAULT_FCDISTRO=f31
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
 DEFAULT_MAILDEST="build at onelab.eu"
diff --git a/lxc.mk b/lxc.mk
index 0554e31c..f8332831 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -24,7 +24,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), f29)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31)"
 #
 transforward-MODULES := transforward
 transforward-SPEC := transforward.spec
@@ -171,8 +171,8 @@ IN_SLICEIMAGE += bind_public
 ALL += bind_public
 
 # in fedora 29, this triggers nasty-looking compile messages
-# not trying too hard, we're mostly after the server-side of f29
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29)"
+# not trying too hard, we're mostly after the server-side of f29 and above
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31)"
 #
 # sliver-openvswitch
 #
@@ -385,7 +385,7 @@ ALL += release
 # so, let's keep this out of the way for now
 # 2019 mar 27: reinstating for hopefully connecting fed4fire
 #
-#ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f27 f29)"
+#ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f27 f29 f31)"
 sfa-MODULES := sfa
 sfa-SPEC := sfa.spec
 ALL += sfa
diff --git a/mirroring/f31/yum.repos.d/building.repo.in b/mirroring/f31/yum.repos.d/building.repo.in
new file mode 100644
index 00000000..4e779727
--- /dev/null
+++ b/mirroring/f31/yum.repos.d/building.repo.in
@@ -0,0 +1,23 @@
+[fedora]
+name=Fedora 31 - $basearch
+baseurl=@MIRRORURL@/fedora/releases/31/Everything/$basearch/os/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-31-primary
+
+[updates]
+name=Fedora 31 - $basearch - Updates
+baseurl=@MIRRORURL@/fedora/updates/31/Everything/$basearch/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-31-primary
+
+[modular]
+name=Fedora 31 - $basearch - Updates
+baseurl=@MIRRORURL@/fedora/updates/31/Modular/$basearch/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-31-primary
diff --git a/pkgs.py b/pkgs.py
index 24b49b7f..d6ea5999 100755
--- a/pkgs.py
+++ b/pkgs.py
@@ -35,14 +35,14 @@ from optparse import OptionParser
 import re
 
 default_arch = 'x86_64'
-known_arch = ['i386', 'i686', 'x86_64']
-default_fcdistro = 'f29'
+known_archs = ['i386', 'i686', 'x86_64']
+default_fcdistro = 'f31'
 known_fcdistros = [
     'centos5', 'centos6',
     # oldies but we have references to that in the pkgs files
     'f8', 'f10', 'f12', 'f14', 'f16', 'f18', 'f20', 'f21', 'f22', 'f23', 'f24',
     # these ones are still relevant
-    'f25', 'f27', 'f29',
+    'f25', 'f27', 'f29', 'f31'
     # scientific linux
     'sl6',
     # debians
@@ -242,7 +242,7 @@ def main ():
         sys.exit(1)
     keyword = args[0]
     inputs = args[1:]
-    if not options.arch in known_arch:
+    if not options.arch in known_archs:
         print('Unsupported arch', options.arch, file=stderr)
         parser.print_help(file=stderr)
         sys.exit(1)
-- 
2.43.0