From e5b6b489890388a37fb0cbedb349dd6b65b46a6d Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 13 May 2014 10:55:33 +0200 Subject: [PATCH] ubuntu-13.04 is trusty --- README-fcdistros.txt | 2 +- build.common | 2 +- lbuild-initvm.sh | 4 ++-- pkgs.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README-fcdistros.txt b/README-fcdistros.txt index a300d7c1..038af07a 100644 --- a/README-fcdistros.txt +++ b/README-fcdistros.txt @@ -13,7 +13,7 @@ # # the build utilities can now produce a build VM for the most recent # debians (squeeze, wheezy, jessie) and ubuntus ( oreinic, precise, quantal, -# raring, saucy ) +# raring, saucy, trusty ) # # of course we're nowhere close to supporting the whole PLC on these # systems, as packaging for debian requires manual tweaks in every diff --git a/build.common b/build.common index b248986c..071a9658 100644 --- a/build.common +++ b/build.common @@ -66,7 +66,7 @@ function pl_getReleaseName () { [Ss]L*) releasename=sl$release ;; - squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy) + squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty) releasename=$distro ;; *) diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh index 0dca2a5c..df78c11f 100755 --- a/lbuild-initvm.sh +++ b/lbuild-initvm.sh @@ -71,7 +71,7 @@ function package_method () { fcdistro=$1; shift case $fcdistro in f[0-9]*|centos[0-9]*|sl[0-9]*) echo yum ;; - squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy) echo debootstrap ;; + squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty) echo debootstrap ;; *) echo Unknown distro $fcdistro ;; esac } @@ -363,7 +363,7 @@ function debian_mirror () { case $fcdistro in squeeze|wheezy|jessie) echo http://ftp2.fr.debian.org/debian/ ;; - oneiric|precise|quantal|raring|saucy) + oneiric|precise|quantal|raring|saucy|trusty) echo http://mir1.ovh.net/ubuntu/ubuntu/ ;; *) echo unknown distro $fcdistro; exit 1;; esac diff --git a/pkgs.py b/pkgs.py index 669afc68..7525c0b3 100755 --- a/pkgs.py +++ b/pkgs.py @@ -40,7 +40,7 @@ known_fcdistros = [ 'centos5','centos6', # debians 'squeeze','wheezy','jessie', # ubuntus - 'oneiric', 'precise', 'quantal', 'raring', 'saucy' ] + 'oneiric', 'precise', 'quantal', 'raring', 'saucy', 'trusty' ] default_pldistro='onelab' known_keywords=[ -- 2.43.0