From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 4 Nov 2015 09:05:52 +0000 (+0100)
Subject: prepare for f23
X-Git-Tag: 5.3.10~22
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=17a266c6da4a078bfddfa1a486bf92d3cd3b0b44

prepare for f23
---

diff --git a/build.common b/build.common
index 183994db..64c4fe8c 100644
--- a/build.common
+++ b/build.common
@@ -7,8 +7,8 @@
 # Copyright (C) 2007 The Trustees of Princeton University
 # Thierry Parmentelat <thierry.parmentelat@inria.fr> INRIA
 #
-# supported distros f12 f14 f16 f18 f20 f21 f22
-# and debians/ubuntus to a lesser extent
+# supported distros fedoras, and debians/ubuntus to a lesser extent
+# centos's and scientific linux's have been used too quite a while ago
 #
 # for locating pkgs.py
 export PATH=.:$PATH
diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs
index 404727d0..dca20f88 100644
--- a/config.lxc/nodeimage.pkgs
+++ b/config.lxc/nodeimage.pkgs
@@ -4,7 +4,7 @@
 groupname: PlanetLab
 groupdesc: PlanetLab Node Root
 # our own modules
-# turned off on f21+f22 - hopefully on a temporary basis
+# turned off on >=f21 - hopefully on a temporary basis
 package<=f20: ipfwroot
 package: lxc-userspace
 package: transforward
diff --git a/fedora-mirror.sh b/fedora-mirror.sh
index 68cb495b..c118bb2c 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="f22"
-all_distronames="f21 f22"
+default_distroname="f23"
+all_distronames="f21 f22 f23"
 
 global_arch="x86_64"
 
@@ -100,7 +100,7 @@ function run () {
 function main () {
     distronames=""
     archs="$global_arch"
-    while getopts "nvlc:u:sef:Fh" opt ; do
+    while getopts "nvlcu:sef:Fh" opt ; do
 	case $opt in
 	    n) dry_run=--dry-run ;;
 	    v) verbose= ;;
diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 7db3220c..0d22f491 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=f22
+DEFAULT_FCDISTRO=f23
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
 DEFAULT_MEMORY=3072
diff --git a/pkgs.py b/pkgs.py
index 8bbc43ab..78b37c6f 100755
--- a/pkgs.py
+++ b/pkgs.py
@@ -35,13 +35,13 @@ import re
 
 default_arch='x86_64'
 known_arch = ['i386', 'i686', 'x86_64']
-default_fcdistro = 'f22'
+default_fcdistro = 'f23'
 known_fcdistros = [
     'centos5', 'centos6',
     # oldies but we have references to that in the pkgs files
     'f8', 'f10', 'f12', 'f16',
     # these ones are still relevant
-    'f14', 'f18', 'f20', 'f21', 'f22',
+    'f14', 'f18', 'f20', 'f21', 'f22', 'f23',
     'sl6', 
     # debians
     'wheezy','jessie',