back to using lxc-userspace from master after 5.2.5 is out

[build.git] / pkgs.py

diff --git a/pkgs.py b/pkgs.py
index 74261db..84010db 100755 (executable)
--- a/pkgs.py
+++ b/pkgs.py
@@ -32,12 +32,15 @@ from optparse import OptionParser
 import re
 
 default_arch='x86_64'
-known_arch = ['i386','x86_64']
+known_arch = ['i386', 'i686', 'x86_64']
 default_fcdistro='f14'
 known_fcdistros = [ 'centos5','centos6',
-                    'f8', 'f10','f12', 'f14', 'f16', 'f17',
+                    'f8', 'f10','f12', 'f14', 'f16', 'f18',
                     'sl6', 
-                    'lenny','squeeze','wheezy','jessie' ]
+                    # debians
+                    'squeeze','wheezy',
+                    # ubuntus
+                    'oneiric', 'precise', 'quantal', 'raring' ]
 default_pldistro='onelab'
 
 known_keywords=['groupname', 'groupdesc', 
@@ -215,6 +218,7 @@ def main ():
         print >> stderr, 'Unsupported arch',options.arch
         parser.print_help(file=stderr)
         sys.exit(1)
+    if options.arch == 'i686': options.arch='i386'
     if not options.fcdistro in known_fcdistros:
         print >> stderr, 'Unsupported fcdistro',options.fcdistro
         parser.print_help(file=stderr)