add forthcoming ubuntu (wily) and cleanup older fcdistros on all 3 accounts (fedora...

diff --git a/README-fcdistros.txt b/README-fcdistros.txt
index 038af07..8b9b8c2 100644 (file)
--- a/README-fcdistros.txt
+++ b/README-fcdistros.txt
@@ -12,8 +12,7 @@
 # #################### debians and ubuntus
 #
 # the build utilities can now produce a build VM for the most recent
 # #################### debians and ubuntus
 #
 # the build utilities can now produce a build VM for the most recent

-# debians (squeeze, wheezy, jessie) and ubuntus ( oreinic, precise, quantal,
-# raring, saucy, trusty )
+# debians and ubuntus

 # 
 # of course we're nowhere close to supporting the whole PLC on these
 # systems, as packaging for debian requires manual tweaks in every
 # 
 # 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 89540ed..183994d 100644 (file)
--- a/build.common
+++ b/build.common
@@ -23,7 +23,6 @@ function pl_getDistro() {
        distro=$DISTRIB_CODENAME 
     elif [ -f /etc/debian_version ] ; then
        case $(cat /etc/debian_version) in
        distro=$DISTRIB_CODENAME 
     elif [ -f /etc/debian_version ] ; then
        case $(cat /etc/debian_version) in

-           6.*) distro=squeeze ;;

            7.*) distro=wheezy  ;;
            # might be that I'm getting 'jessie'sid' just because it's still testing..
            8.*|jessie*) distro=jessie  ;;
            7.*) distro=wheezy  ;;
            # might be that I'm getting 'jessie'sid' just because it's still testing..
            8.*|jessie*) distro=jessie  ;;


@@ -66,7 +65,7 @@ function pl_getReleaseName () {
        [Ss]L*)
            releasename=sl$release
            ;;
        [Ss]L*)
            releasename=sl$release
            ;;

-       squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty|utopic|vivid)
+       wheezy|jessie|precise|trusty|utopic|vivid|wily)

            releasename=$distro
            ;;
        *)
            releasename=$distro
            ;;
        *)

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 7320e65..7db3220 100755 (executable)
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -81,9 +81,12 @@ EOF
 function package_method () {
     fcdistro=$1; shift
     case $fcdistro in
 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|trusty|utopic|vivid) echo debootstrap ;;
-       *) echo Unknown distro $fcdistro ;;
+       f[0-9]*|centos[0-9]*|sl[0-9]*)
+           echo yum ;;
+       wheezy|jessie|precise|trusty|utopic|vivid|wily)
+           echo debootstrap ;;
+       *)
+           echo Unknown distro $fcdistro ;;

     esac 
 }
 
     esac 
 }
 


@@ -389,9 +392,9 @@ EOF
 function debian_mirror () {
     fcdistro=$1; shift
     case $fcdistro in
 function debian_mirror () {
     fcdistro=$1; shift
     case $fcdistro in

-       squeeze|wheezy|jessie) 
+       wheezy|jessie) 

            echo http://ftp2.fr.debian.org/debian/ ;;
            echo http://ftp2.fr.debian.org/debian/ ;;

-       oneiric|precise|quantal|raring|saucy|trusty|utopic|vivid) 
+       precise|trusty|utopic|vivid|wily) 

 #          echo http://mir1.ovh.net/ubuntu/ubuntu/ ;;
            echo http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ ;;
        *) echo unknown distro $fcdistro; exit 1;;
 #          echo http://mir1.ovh.net/ubuntu/ubuntu/ ;;
            echo http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ ;;
        *) echo unknown distro $fcdistro; exit 1;;

diff --git a/pkgs.py b/pkgs.py
index 23c00c7..0ba73cf 100755 (executable)
--- a/pkgs.py
+++ b/pkgs.py
@@ -33,17 +33,23 @@ import re
 
 default_arch='x86_64'
 known_arch = ['i386', 'i686', 'x86_64']
 
 default_arch='x86_64'
 known_arch = ['i386', 'i686', 'x86_64']

-default_fcdistro='f14'
-known_fcdistros = [ 'centos5','centos6',
-                    'f8', 'f10', 'f12', 'f14', 'f16', 'f18', 'f20', 'f21', 'f22',
-                    'sl6', 
-                    # debians
-                    'squeeze','wheezy','jessie',
-                    # ubuntus
-                    'oneiric', 'precise', 'quantal', 'raring', 'saucy', 'trusty', 'utopic', 'vivid' ]
+default_fcdistro = 'f22'
+known_fcdistros = [
+    'centos5', 'centos6',
+    'f14', 'f18', 'f20', 'f21', 'f22',
+    'sl6', 
+    # debians
+    'wheezy','jessie',
+    # ubuntus
+    'precise', # 12.04 LTS
+    'trusty',  # 14.04 LTS
+    'utopic',  # 14.10
+    'vivid',   # 15.04
+    'wily',    # 15.10
+]

 default_pldistro='onelab'
 
 default_pldistro='onelab'
 

-known_keywords=[
+known_keywords = [

     'group', 'groupname', 'groupdesc', 
      'package', 'pip', 'gem', 
     'nodeyumexclude', 'plcyumexclude', 'yumexclude',
     'group', 'groupname', 'groupdesc', 
      'package', 'pip', 'gem', 
     'nodeyumexclude', 'plcyumexclude', 'yumexclude',