From bbb5d646f4c8c30bf9c4ce968d22bca26c17d69b Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 20 Nov 2024 12:05:04 +0100
Subject: [PATCH] move to default f41
---
create-vm.sh | 2 +-
fedora-mirror.sh | 4 ++--
lbuild-initvm.sh | 2 +-
lbuild-nightly.sh | 2 +-
.../centos6/yum.repos.d/building.repo.in | 19 ---------------
mirroring/f37/yum.repos.d/building.repo.in | 23 -------------------
mirroring/f41/yum.repos.d/building.repo.in | 23 +++++++++++++++++++
pkgs.py | 4 ++--
8 files changed, 30 insertions(+), 49 deletions(-)
delete mode 100644 mirroring/centos6/yum.repos.d/building.repo.in
delete mode 100644 mirroring/f37/yum.repos.d/building.repo.in
create mode 100644 mirroring/f41/yum.repos.d/building.repo.in
diff --git a/create-vm.sh b/create-vm.sh
index 658f4160..ac5e9682 100755
--- a/create-vm.sh
+++ b/create-vm.sh
@@ -28,7 +28,7 @@ LOGS=$HOME/machines
DOMAIN=pl.sophia.inria.fr
-DEFAULT_DISTRO=f39
+DEFAULT_DISTRO=f41
DEFAULT_MEMORY=16384
CONFIRM=
diff --git a/fedora-mirror.sh b/fedora-mirror.sh
index c3d6d70b..637bf83b 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="f39"
-all_distronames="f37 f39"
+default_distroname="f41"
+all_distronames="f39 f41"
global_arch="x86_64"
diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index a8fa5ee3..cdb44734 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=f39
+DEFAULT_FCDISTRO=f41
DEFAULT_PLDISTRO=lxc
DEFAULT_PERSONALITY=linux64
DEFAULT_MEMORY=3072
diff --git a/lbuild-nightly.sh b/lbuild-nightly.sh
index 3f21c741..e69924c8 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=f39
+DEFAULT_FCDISTRO=f41
DEFAULT_PLDISTRO=lxc
DEFAULT_PERSONALITY=linux64
DEFAULT_MAILDEST="thierry.parmentelat at inria.fr"
diff --git a/mirroring/centos6/yum.repos.d/building.repo.in b/mirroring/centos6/yum.repos.d/building.repo.in
deleted file mode 100644
index cfc65cf4..00000000
--- a/mirroring/centos6/yum.repos.d/building.repo.in
+++ /dev/null
@@ -1,19 +0,0 @@
-[base]
-name=CentOS-$releasever - Base
-baseurl=@MIRRORURL@/centos/6.4/os/$basearch/
-gpgcheck=1
-gpgkey=@MIRRORURL@/centos/RPM-GPG-KEY-CentOS-6
-
-[updates]
-name=CentOS-$releasever - Updates
-baseurl=@MIRRORURL@/centos/6.4/updates/$basearch/
-gpgcheck=1
-gpgkey=@MIRRORURL@/centos/RPM-GPG-KEY-CentOS-6
-
-[epel]
-name=Extra Packages for Enterprise Linux 6 - $basearch
-baseurl=@MIRRORURL@/fedora-epel/6/i386/
-failovermethod=priority
-enabled=1
-gpgcheck=1
-gpgkey=@MIRRORURL@/fedora-epel/RPM-GPG-KEY-EPEL-6
diff --git a/mirroring/f37/yum.repos.d/building.repo.in b/mirroring/f37/yum.repos.d/building.repo.in
deleted file mode 100644
index 540ff798..00000000
--- a/mirroring/f37/yum.repos.d/building.repo.in
+++ /dev/null
@@ -1,23 +0,0 @@
-[fedora]
-name=Fedora 37 - $basearch
-baseurl=@MIRRORURL@/fedora/releases/37/Everything/$basearch/os/
-enabled=1
-metadata_expire=7d
-gpgcheck=1
-gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-37-primary
-
-[updates]
-name=Fedora 37 - $basearch - Updates
-baseurl=@MIRRORURL@/fedora/updates/37/Everything/$basearch/
-enabled=1
-metadata_expire=7d
-gpgcheck=1
-gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-37-primary
-
-[modular]
-name=Fedora 37 - $basearch - Updates
-baseurl=@MIRRORURL@/fedora/updates/37/Modular/$basearch/
-enabled=1
-metadata_expire=7d
-gpgcheck=1
-gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-37-primary
diff --git a/mirroring/f41/yum.repos.d/building.repo.in b/mirroring/f41/yum.repos.d/building.repo.in
new file mode 100644
index 00000000..a4d90d85
--- /dev/null
+++ b/mirroring/f41/yum.repos.d/building.repo.in
@@ -0,0 +1,23 @@
+[fedora]
+name=Fedora 41 - $basearch
+baseurl=@MIRRORURL@/fedora/releases/41/Everything/$basearch/os/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-41-primary
+
+[updates]
+name=Fedora 41 - $basearch - Updates
+baseurl=@MIRRORURL@/fedora/updates/41/Everything/$basearch/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-41-primary
+
+[modular]
+name=Fedora 41 - $basearch - Updates
+baseurl=@MIRRORURL@/fedora/updates/41/Modular/$basearch/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-41-primary
diff --git a/pkgs.py b/pkgs.py
index 4ea3b00f..1a4bb1a0 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 = 'f39'
+default_fcdistro = 'f41'
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', 'f37', 'f39', 'f40',
+ 'f29', 'f31', 'f32', 'f33', 'f35', 'f37', 'f39', 'f41',
# scientific linux
'sl6',
# debians
--
2.47.0