From: Thierry Parmentelat Date: Wed, 6 Mar 2019 11:24:23 +0000 (+0100) Subject: support building 18.04 ubuntus X-Git-Tag: last-complete-build-f29~28 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=8ddb497d444f08301531efe5b2d9c09e7df66d55;p=build.git support building 18.04 ubuntus --- diff --git a/build.common b/build.common index 9f3adfb7..1320910d 100644 --- a/build.common +++ b/build.common @@ -65,7 +65,7 @@ function pl_getReleaseName () { [Ss]L*) releasename=sl$release ;; - wheezy|jessie|precise|trusty|utopic|vivid|wily|xenial) + wheezy|jessie|trusty|xenial|bionic) releasename=$distro ;; *) diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh index 5dedf7f8..35e4c388 100755 --- a/lbuild-initvm.sh +++ b/lbuild-initvm.sh @@ -82,7 +82,7 @@ function package_method () { case $fcdistro in f[0-9]*|centos[0-9]*|sl[0-9]*) echo dnf ;; - wheezy|jessie|precise|trusty|utopic|vivid|wily|xenial) + wheezy|jessie|trusty|xenial|bionic) echo debootstrap ;; *) echo Unknown distro $fcdistro ;; @@ -375,7 +375,7 @@ function debian_mirror () { case $fcdistro in wheezy|jessie) echo http://ftp2.fr.debian.org/debian/ ;; - precise|trusty|utopic|vivid|wily|xenial) + trusty|xenial|bionic) echo http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ ;; *) echo unknown distro $fcdistro; exit 1;; esac diff --git a/pkgs.py b/pkgs.py index d4445f06..24b49b7f 100755 --- a/pkgs.py +++ b/pkgs.py @@ -50,6 +50,7 @@ known_fcdistros = [ # ubuntus 'trusty', # 14.04 LTS 'xenial', # 16.04 LTS + 'bionic', # 18.04 LTS ] default_pldistro = 'onelab'