Bug 857697 - linux32 builds to x86-64 mock environments -- rms unneeded block, r=callek
authorJordan Lund <jlund@mozilla.com>
Sun, 30 Mar 2014 17:14:22 -0700
changeset 10106 df255296d2d1e14105b63d283eb496ee28073bea
parent 10105 34bbfa7b4a5e5161c8c10bbfb95c862ce414b167
child 10107 70e201c6330f47254ef5531d494dc2eedd4f9569
push id7492
push userjlund@mozilla.com
push dateMon, 31 Mar 2014 00:19:30 +0000
reviewerscallek
bugs857697
Bug 857697 - linux32 builds to x86-64 mock environments -- rms unneeded block, r=callek
mozilla/config.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2294,42 +2294,16 @@ for b in BRANCHES.keys():
         if 'android-noion' in BRANCHES[b]['platforms']:
             del BRANCHES[b]['platforms']['android-noion']
 
 for _, branch in items_before(BRANCHES, 'gecko_version', 26):
     for p in 'linux64-asan', 'linux64-asan-debug':
         if p in branch['platforms']:
             del branch['platforms'][p]
 
-# Building 32-bit linux in a x86_64 env rides the trains (bug 857697)
-for name, branch in items_before(BRANCHES, 'gecko_version', 24):
-    for platform in ['linux', 'linux-debug']:
-        if platform not in branch['platforms']:
-            continue
-        branch['platforms'][platform]['mock_target'] = 'mozilla-centos6-i386'
-        branch['platforms'][platform]['mock_packages'] = \
-            ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial',
-             'git', 'ccache', 'glibc-static', 'libstdc++-static',
-             'perl-Test-Simple', 'perl-Config-General',
-             'gtk2-devel', 'libnotify-devel', 'yasm',
-             'alsa-lib-devel', 'libcurl-devel',
-             'wireless-tools-devel', 'libX11-devel',
-             'libXt-devel', 'mesa-libGL-devel',
-             'gnome-vfs2-devel', 'GConf2-devel', 'wget',
-             'mpfr', # required for system compiler
-             'xorg-x11-font*', # fonts required for PGO
-             'imake', # required for makedepend!?!
-             'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1', 'yasm', 'ccache', # <-- from releng repo
-             'pulseaudio-libs-devel',
-             'freetype-2.3.11-6.el6_2.9',
-             'freetype-devel-2.3.11-6.el6_2.9',
-            ]
-        if not platform.endswith("-debug"):
-            branch["platforms"][platform]["mock_packages"] += ["valgrind"]
-
 # Building android in a x86_64 env rides the trains (bug 860246)
 for name, branch in items_before(BRANCHES, 'gecko_version', 24):
     for plat in ['android', 'android-armv6', 'android-noion',
                  'android-x86', 'android-debug']:
         if plat in branch['platforms']:
             branch['platforms'][plat]['mock_target'] = 'mozilla-centos6-i386'
 
 # pulseaudio-libs-devel package rides the trains (bug 662417)