Преглед на файлове

add support for CentOS 6 target in the build script

Ashish Kulkarni преди 11 години
родител
ревизия
38e17f9fa7
променени са 2 файла, в които са добавени 13 реда и са изтрити 0 реда
  1. 1 0
      INSTALL.md
  2. 12 0
      scripts/build.py

+ 1 - 0
INSTALL.md

@@ -17,6 +17,7 @@ Target         | Command for Setup
 ------         | -----------------
 ------         | -----------------
 Debian Wheezy  | ```sudo scripts/build.py setup-schroot-wheezy```
 Debian Wheezy  | ```sudo scripts/build.py setup-schroot-wheezy```
 CentOS 5       | ```sudo scripts/build.py setup-schroot-centos5```
 CentOS 5       | ```sudo scripts/build.py setup-schroot-centos5```
+CentOS 6       | ```sudo scripts/build.py setup-schroot-centos6```
 MinGW-w64      | ```sudo scripts/build.py setup-mingw-w64```
 MinGW-w64      | ```sudo scripts/build.py setup-mingw-w64```
 
 
 The MinGW-w64 toolchain can cross-compile 32/64-bit Windows binaries from 
 The MinGW-w64 toolchain can cross-compile 32/64-bit Windows binaries from 

+ 12 - 0
scripts/build.py

@@ -169,10 +169,13 @@ BUILDERS = {
     'msvc-winsdk71-win64':   'msvc_winsdk71',
     'msvc-winsdk71-win64':   'msvc_winsdk71',
     'setup-mingw-w64':       'setup_mingw64',
     'setup-mingw-w64':       'setup_mingw64',
     'setup-schroot-centos5': 'setup_schroot',
     'setup-schroot-centos5': 'setup_schroot',
+    'setup-schroot-centos6': 'setup_schroot',
     'setup-schroot-wheezy':  'setup_schroot',
     'setup-schroot-wheezy':  'setup_schroot',
     'update-all-schroots':   'update_schroot',
     'update-all-schroots':   'update_schroot',
     'centos5-i386':          'linux_schroot',
     'centos5-i386':          'linux_schroot',
     'centos5-amd64':         'linux_schroot',
     'centos5-amd64':         'linux_schroot',
+    'centos6-i386':          'linux_schroot',
+    'centos6-amd64':         'linux_schroot',
     'wheezy-i386':           'linux_schroot',
     'wheezy-i386':           'linux_schroot',
     'wheezy-amd64':          'linux_schroot',
     'wheezy-amd64':          'linux_schroot',
     'mingw-w64-cross-win32': 'mingw64_cross',
     'mingw-w64-cross-win32': 'mingw64_cross',
@@ -204,6 +207,15 @@ deb-src http://security.debian.org/   wheezy/updates main contrib non-free"""),
         ('shell', 'yum install -y gcc gcc-c++ make qt4-devel openssl-devel diffutils perl xz'),
         ('shell', 'yum install -y gcc gcc-c++ make qt4-devel openssl-devel diffutils perl xz'),
         ('write_file', 'update.sh', 'yum update -y\n'),
         ('write_file', 'update.sh', 'yum update -y\n'),
         ('schroot_conf', 'CentOS 5')
         ('schroot_conf', 'CentOS 5')
+    ],
+
+    'centos6': [
+        ('rinse', 'centos-6'),
+        ('shell', 'yum update -y'),
+        ('append_file:amd64', 'etc/yum.conf', 'exclude = *.i?86\n'),
+        ('shell', 'yum install -y gcc gcc-c++ make qt4-devel openssl-devel diffutils perl tar xz'),
+        ('write_file', 'update.sh', 'yum update -y\n'),
+        ('schroot_conf', 'CentOS 6')
     ]
     ]
 }
 }