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
DOMAIN=pl.sophia.inria.fr
-DEFAULT_DISTRO=f29
+DEFAULT_DISTRO=f31
DEFAULT_MEMORY=16384
CONFIRM=
# 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
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"
# 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
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
#
# 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
--- /dev/null
+[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
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
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)