From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 21 Feb 2022 17:05:44 +0000 (+0100)
Subject: quick $ dirty f35 for create-cm.sh
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=801a31c0c136056350f1e0cf4fec028b4ec9c7e5

quick $ dirty f35 for create-cm.sh
---

diff --git a/Makefile b/Makefile
index d4ccf47e..d35cc7a3 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)"
+ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29 f31 f33 f35)"
 	echo "%define debug_package %{nil}" >> $@
 endif
 
diff --git a/create-vm.sh b/create-vm.sh
index 3ac36326..da3de79c 100755
--- a/create-vm.sh
+++ b/create-vm.sh
@@ -28,7 +28,7 @@ LOGS=$HOME/machines
 
 DOMAIN=pl.sophia.inria.fr
 
-DEFAULT_DISTRO=f33
+DEFAULT_DISTRO=f35
 DEFAULT_MEMORY=16384
 
 CONFIRM=
diff --git a/fedora-mirror.sh b/fedora-mirror.sh
index 7952453e..0bfb7bcc 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="f33"
-all_distronames="f31 f33"
+default_distroname="f35"
+all_distronames="f33 f35"
 
 global_arch="x86_64"
 
diff --git a/lbuild-nightly.sh b/lbuild-nightly.sh
index 997e3e36..c60677e1 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=f33
+DEFAULT_FCDISTRO=f35
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
 DEFAULT_MAILDEST="build at onelab.eu"
diff --git a/lxc.mk b/lxc.mk
index 1443d25c..59f239f8 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -11,7 +11,7 @@
 
 
 ### starting with f31 : server-side-only
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
 ###
 
 
@@ -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), f29 f31 f33)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31 f33 f35)"
 #
 transforward-MODULES := transforward
 transforward-SPEC := transforward.spec
@@ -149,7 +149,7 @@ ALL += pf2slice
 #                                ^^^
 #Error: This expression has type string but an expression was expected of type bytes
 #
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f33)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f33 f35)"
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
 # ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
@@ -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 server-side of f29 and above
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31 f33)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31 f33 f35)"
 #
 # sliver-openvswitch
 #
@@ -251,7 +251,7 @@ IN_MYPLC += www-register-wizard
 # stdsoap2.cpp:8259:18: error: narrowing conversion of ‘2147483708’ from ‘unsigned int’ to ‘int’ [-Wnarrowing]
 #  8259 |       case '<' | 0x80000000:
 #       |                  ^~~~~~~~~~
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f33)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f33 f35)"
 pcucontrol-MODULES := pcucontrol
 pcucontrol-SPEC := pcucontrol.spec
 ALL += pcucontrol
@@ -268,7 +268,7 @@ endif
 
 
 ### server-side-only
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f31 f33 f35)"
 ### server-side-only
 
 
diff --git a/mirroring/f35/yum.repos.d/building.repo.in b/mirroring/f35/yum.repos.d/building.repo.in
new file mode 100644
index 00000000..041255d7
--- /dev/null
+++ b/mirroring/f35/yum.repos.d/building.repo.in
@@ -0,0 +1,23 @@
+[fedora]
+name=Fedora 35 - $basearch
+baseurl=@MIRRORURL@/fedora/releases/35/Everything/$basearch/os/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-35-primary
+
+[updates]
+name=Fedora 35 - $basearch - Updates
+baseurl=@MIRRORURL@/fedora/updates/35/Everything/$basearch/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-35-primary
+
+[modular]
+name=Fedora 35 - $basearch - Updates
+baseurl=@MIRRORURL@/fedora/updates/35/Modular/$basearch/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-35-primary
diff --git a/pkgs.py b/pkgs.py
index 36007afc..96b6db7a 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 = 'f33'
+default_fcdistro = 'f35'
 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',
+    'f29', 'f31', 'f32', 'f33', 'f35',
     # scientific linux
     'sl6',
     # debians