From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 27 Jun 2016 12:35:28 +0000 (+0200)
Subject: f24
X-Git-Tag: 5.3.13~24
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=4ce764e2a7f998e223d00c2c26dbc7dc28782c71

f24
---

diff --git a/Makefile b/Makefile
index 6743529c..4d6a73fd 100644
--- a/Makefile
+++ b/Makefile
@@ -351,7 +351,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),f23)"
+ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f23 f24)"
 	echo "%define debug_package %{nil}" >> $@
 endif
 
diff --git a/fedora-mirror.sh b/fedora-mirror.sh
index c118bb2c..a8f6fd9f 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="f23"
-all_distronames="f21 f22 f23"
+default_distroname="f24"
+all_distronames="f22 f23 f24"
 
 global_arch="x86_64"
 
diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 75cb312d..ae41c2b4 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=f23
+DEFAULT_FCDISTRO=f24
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
 DEFAULT_MEMORY=3072
diff --git a/lxc.mk b/lxc.mk
index e1beb529..644b4646 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -31,7 +31,7 @@ IN_NODEIMAGE += transforward
 # procprotect: root context module for protecting against weaknesses in /proc
 #
 ### remove procprotect from the nodes on f20 and above, needs more work starting with 3.19
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23 f24)"
 procprotect-MODULES := procprotect
 procprotect-SPEC := procprotect.spec
 ALL += procprotect
@@ -43,7 +43,7 @@ endif
 #
 ### starting August 2015, ipfw module won't build against fedora22
 # that comes with kernel 4.1.4
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21 f22 f23)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21 f22 f23 f24)"
 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
 ALL += ipfwroot
@@ -130,7 +130,7 @@ IN_NODEIMAGE += codemux
 # fprobe-ulog
 #
 # xxx temporarily turning this off on f20 and above
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23 f24)"
 fprobe-ulog-MODULES := fprobe-ulog
 fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
@@ -385,7 +385,7 @@ IN_NODEIMAGE += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f23)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f23 f24)"
 #
 # OML measurement library
 #
diff --git a/pkgs.py b/pkgs.py
index a2fa4f56..b8528d70 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 = 'f23'
+default_fcdistro = 'f24'
 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', 'f23',
+    'f14', 'f18', 'f20', 'f21', 'f22', 'f23', 'f24',
     'sl6', 
     # debians
     'wheezy','jessie',