f25

diff --git a/Makefile b/Makefile
index 4d6a73f..7ef9e8e 100644 (file)
--- 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" >> $@
        echo "%global _source_filedigest_algorithm 1" >> $@
        echo "%global _source_payload       w9.gzdio" >> $@
        echo "%global _binary_payload       w9.gzdio" >> $@

-ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f23 f24)"
+ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f23 f24 f25)"

        echo "%define debug_package %{nil}" >> $@
 endif
 
        echo "%define debug_package %{nil}" >> $@
 endif
 

diff --git a/fedora-mirror.sh b/fedora-mirror.sh
index a8f6fd9..de615e9 100755 (executable)
--- 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
 
 us_fedora_url=rsync://mirrors.kernel.org/fedora
 eu_fedora_url=rsync://mirror1.hs-esslingen.de/fedora/linux
 

-default_distroname="f24"
-all_distronames="f22 f23 f24"
+default_distroname="f25"
+all_distronames="f23 f24 f25"

 
 global_arch="x86_64"
 
 
 global_arch="x86_64"
 

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index addf7eb..2a1b785 100755 (executable)
--- 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
 
 
 # XXX fixme : when creating a 32bits VM we need to call linux32 as appropriate...s
 

-DEFAULT_FCDISTRO=f24
+DEFAULT_FCDISTRO=f25

 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
 DEFAULT_MEMORY=3072
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
 DEFAULT_MEMORY=3072

diff --git a/lxc.mk b/lxc.mk
index 644b464..0a8d54b 100644 (file)
--- 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
 # 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 f24)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23 f24 f25)"

 procprotect-MODULES := procprotect
 procprotect-SPEC := procprotect.spec
 ALL += procprotect
 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
 #
 ### starting August 2015, ipfw module won't build against fedora22
 # that comes with kernel 4.1.4

-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21 f22 f23 f24)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21 f22 f23 f24 f25)"

 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
 ALL += ipfwroot
 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
 # fprobe-ulog
 #
 # xxx temporarily turning this off on f20 and above

-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23 f24)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23 f24 f25)"

 fprobe-ulog-MODULES := fprobe-ulog
 fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 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
 
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 

-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f23 f24)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f23 f24 f25)"

 #
 # OML measurement library
 #
 #
 # OML measurement library
 #

diff --git a/mirroring/f25/yum.repos.d/building.repo.in b/mirroring/f25/yum.repos.d/building.repo.in
new file mode 100644 (file)
index 0000000..a39fb56
--- /dev/null
+++ b/mirroring/f25/yum.repos.d/building.repo.in
@@ -0,0 +1,16 @@
+[fedora]
+name=Fedora 25 - $basearch
+baseurl=@MIRRORURL@/fedora/releases/25/Everything/$basearch/os/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-25-primary
+
+[updates]
+name=Fedora 25 - $basearch - Updates
+baseurl=@MIRRORURL@/fedora/updates/25/$basearch/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-25-primary
+

diff --git a/pkgs.py b/pkgs.py
index b8528d7..abfc53b 100755 (executable)
--- a/pkgs.py
+++ b/pkgs.py
@@ -35,13 +35,13 @@ import re
 
 default_arch='x86_64'
 known_arch = ['i386', 'i686', 'x86_64']
 
 default_arch='x86_64'
 known_arch = ['i386', 'i686', 'x86_64']

-default_fcdistro = 'f24'
+default_fcdistro = 'f25'

 known_fcdistros = [
     'centos5', 'centos6',
     # oldies but we have references to that in the pkgs files
     'f8', 'f10', 'f12', 'f16',
     # these ones are still relevant
 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', 'f24',
+    'f14', 'f18', 'f20', 'f21', 'f22', 'f23', 'f24', 'f25',

     'sl6', 
     # debians
     'wheezy','jessie',
     'sl6', 
     # debians
     'wheezy','jessie',