Browse Source

remove support for CentOS 5 builds

Not all security fixes are being backported in "Production 3 Phase",
see http://lists.centos.org/pipermail/centos/2014-November/148008.html
Ashish Kulkarni 10 years ago
parent
commit
618a13776d
3 changed files with 3 additions and 32 deletions
  1. 1 0
      CHANGELOG.md
  2. 0 1
      INSTALL.md
  3. 2 31
      scripts/build.py

+ 1 - 0
CHANGELOG.md

@@ -1,5 +1,6 @@
 v0.12.3 (unreleased)
 ----------------------
+* removed support for CentOS 5 builds
 * update OpenSSL to 1.0.1m
 * **#2104**: renamed COPYING to LICENSE
 

+ 0 - 1
INSTALL.md

@@ -47,7 +47,6 @@ Ubuntu Trusty  | `sudo scripts/build.py setup-schroot-trusty`  | `scripts/build.
 Ubuntu Precise | `sudo scripts/build.py setup-schroot-precise` | `scripts/build.py precise-i386`          | `scripts/build.py precise-amd64`
 CentOS 7       | `sudo scripts/build.py setup-schroot-centos7` | not available                            | `scripts/build.py centos7-amd64`
 CentOS 6       | `sudo scripts/build.py setup-schroot-centos6` | `scripts/build.py centos6-i386`          | `scripts/build.py centos6-amd64`
-CentOS 5       | `sudo scripts/build.py setup-schroot-centos5` | `scripts/build.py centos5-i386`          | `scripts/build.py centos5-amd64`
 MinGW-w64      | `sudo scripts/build.py setup-mingw_w64`       | `scripts/build.py mingw-w64-cross-win32` | `scripts/build.py mingw-w64-cross-win64`
 
 The MinGW-w64 toolchain can cross-compile 32/64-bit Windows binaries from

+ 2 - 31
scripts/build.py

@@ -24,7 +24,6 @@ BUILDERS = {
     'msvc2013-win32':        'msvc',
     'msvc2013-win64':        'msvc',
     'setup-mingw_w64':       'setup_schroot',
-    'setup-schroot-centos5': 'setup_schroot',
     'setup-schroot-centos6': 'setup_schroot',
     'setup-schroot-centos7': 'setup_schroot',
     'setup-schroot-wheezy':  'setup_schroot',
@@ -32,8 +31,6 @@ BUILDERS = {
     'setup-schroot-trusty':  'setup_schroot',
     'setup-schroot-precise': 'setup_schroot',
     'update-all-schroots':   'update_schroot',
-    'centos5-i386':          'linux_schroot',
-    'centos5-amd64':         'linux_schroot',
     'centos6-i386':          'linux_schroot',
     'centos6-amd64':         'linux_schroot',
     'centos7-amd64':         'linux_schroot',
@@ -213,13 +210,6 @@ FPM_SETUP = {
         '--depends':         ['fontconfig', 'libfontconfig1', 'libfreetype6', 'libpng12-0', 'zlib1g', 'libjpeg8', 'libssl1.0.0',
                               'libx11-6', 'libxext6', 'libxrender1', 'xfonts-base', 'xfonts-75dpi', 'libstdc++6', 'libc6']
     },
-    'centos5': {
-        '-t':                'rpm',
-        '--epoch':           '1',
-        '--rpm-compression': 'bzip2',
-        '--depends':         ['fontconfig', 'freetype', 'libpng', 'zlib', 'libjpeg', 'openssl', 'libstdc++', 'glibc',
-                              'libX11', 'libXext', 'libXrender', 'xorg-x11-fonts-Type1', 'xorg-x11-fonts-75dpi']
-    },
     'centos6': {
         '-t':                'rpm',
         '--epoch':           '1',
@@ -310,21 +300,6 @@ deb http://archive.ubuntu.com/ubuntu/ precise-security main restricted universe
         ('schroot_conf', 'Ubuntu Precise')
     ],
 
-    'centos5': [
-        ('rinse', 'centos-5'),
-        ('download_file', 'http://centos.karan.org/el5/ruby187/kbs-el5-ruby187.repo', 'etc/yum.repos.d'),
-        ('download_file', 'http://dl.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm', 'tmp'),
-        ('shell', 'rpm -i /tmp/epel-release-5-4.noarch.rpm'),
-        ('shell', 'yum update -y'),
-        ('append_file:amd64', 'etc/yum.conf', 'exclude = *.i?86\n'),
-        ('shell', 'yum install -y gcc gcc-c++ make diffutils perl ruby-devel rubygems rpm-build libffi-devel'),
-        ('shell', 'yum install -y openssl-devel libX11-devel libXrender-devel libXext-devel fontconfig-devel freetype-devel libjpeg-devel libpng-devel zlib-devel'),
-        ('shell', 'gem install fpm --no-ri --no-rdoc'),
-        ('write_file', 'update.sh', 'yum update -y\ngem update fpm\n'),
-        ('fpm_setup',  'fpm_package.sh'),
-        ('schroot_conf', 'CentOS 5')
-    ],
-
     'centos6': [
         ('rinse', 'centos-6'),
         ('shell', 'yum update -y'),
@@ -1068,12 +1043,8 @@ def build_linux_schroot(config, basedir):
     lines.append('# start of autogenerated build script')
     lines.append('mkdir -p app qt')
     lines.append('cd qt')
-    if config == 'centos5-i386':
-        lines.append('export CFLAGS="-march=i486 -w"')
-        lines.append('export CXXFLAGS="-march=i486 -w"')
-    else:
-        for var in ['CFLAGS', 'CXXFLAGS']:
-            lines.append('export %s="-w"' % var)
+    lines.append('export CFLAGS="-w"')
+    lines.append('export CXXLAGS="-w"')
     lines.append('if [ ! -f is_configured ]; then')
     lines.append('  ../../../qt/configure %s || exit 1' % configure_args)
     lines.append('  touch is_configured')