--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -126,27 +126,49 @@ PLATFORM_VARS = {
'WGET_OPTS': '-q -c',
},
'enable_opt_unittests': False,
'enable_checktests': True,
'enable_build_analysis': True,
'test_pretty_names': False,
'l10n_check_test': False,
'use_mock': True,
- 'mock_target': 'mozilla-centos6-i386',
+ 'mock_target': 'mozilla-centos6-x86_64',
'mock_packages': ['autoconf213', 'mozilla-python27', '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', 'mpfr', 'xorg-x11-font',
+ 'glibc-static.i686', 'libstdc++-static.i686', 'perl-Test-Simple',
+ 'perl-Config-General', 'gtk2-devel.i686', 'libnotify-devel.i686',
+ 'yasm', 'alsa-lib-devel.i686', 'libcurl-devel.i686', 'wireless-tools-devel.i686',
+ 'libX11-devel.i686', 'libXt-devel.i686', 'mesa-libGL-devel.i686',
+ 'gnome-vfs2-devel.i686', 'mpfr', 'xorg-x11-font',
'imake', 'ccache', 'wget',
'gcc472_0moz1', 'gcc473_0moz1',
- 'freetype-2.3.11-6.el6_2.9', 'freetype-devel-2.3.11-6.el6_2.9',
- 'gstreamer-devel', 'gstreamer-plugins-base-devel'],
+ 'freetype-2.3.11-6.el6_1.8.i686', 'freetype-devel-2.3.11-6.el6_1.8.i686',
+ 'freetype-2.3.11-6.el6_1.8.x86_64',
+ 'gstreamer-devel.i686', 'gstreamer-plugins-base-devel.i686',
+ # Packages already installed in the mock environment, as x86_64
+ # packages.
+ 'glibc-devel.i686', 'libgcc.i686', 'libstdc++-devel.i686',
+ # yum likes to install .x86_64 -devel packages that satisfy .i686
+ # -devel packages dependencies. So manually install the dependencies
+ # of the above packages.
+ 'ORBit2-devel.i686', 'atk-devel.i686', 'cairo-devel.i686',
+ 'check-devel.i686', 'dbus-devel.i686', 'dbus-glib-devel.i686',
+ 'fontconfig-devel.i686', 'glib2-devel.i686',
+ 'hal-devel.i686', 'libICE-devel.i686', 'libIDL-devel.i686',
+ 'libSM-devel.i686', 'libXau-devel.i686', 'libXcomposite-devel.i686',
+ 'libXcursor-devel.i686', 'libXdamage-devel.i686', 'libXdmcp-devel.i686',
+ 'libXext-devel.i686', 'libXfixes-devel.i686', 'libXft-devel.i686',
+ 'libXi-devel.i686', 'libXinerama-devel.i686', 'libXrandr-devel.i686',
+ 'libXrender-devel.i686', 'libXxf86vm-devel.i686', 'libdrm-devel.i686',
+ 'libidn-devel.i686', 'libpng-devel.i686', 'libxcb-devel.i686',
+ 'libxml2-devel.i686', 'pango-devel.i686', 'perl-devel.i686',
+ 'pixman-devel.i686', 'zlib-devel.i686',
+ # Packages necessary to run host xpcshell
+ 'libXt.x86_64',
+ ],
'tooltool_manifest_src': 'b2g/config/tooltool-manifests/linux32/releng.manifest',
'gaia_repo': gaia_repo,
'gaia_revision_file': gaia_revision_file,
'gaia_languages_file': 'locales/languages_dev.json',
'mock_copyin_files': [
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.boto', '/builds/.boto'),
@@ -202,27 +224,49 @@ PLATFORM_VARS = {
'WGET_OPTS': '-q -c',
},
'enable_opt_unittests': False,
'enable_checktests': True,
'enable_build_analysis': True,
'test_pretty_names': False,
'l10n_check_test': False,
'use_mock': True,
- 'mock_target': 'mozilla-centos6-i386',
+ 'mock_target': 'mozilla-centos6-x86_64',
'mock_packages': ['autoconf213', 'mozilla-python27', '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', 'mpfr', 'xorg-x11-font',
+ 'glibc-static.i686', 'libstdc++-static.i686', 'perl-Test-Simple',
+ 'perl-Config-General', 'gtk2-devel.i686', 'libnotify-devel.i686',
+ 'yasm', 'alsa-lib-devel.i686', 'libcurl-devel.i686', 'wireless-tools-devel.i686',
+ 'libX11-devel.i686', 'libXt-devel.i686', 'mesa-libGL-devel.i686',
+ 'gnome-vfs2-devel.i686', 'mpfr', 'xorg-x11-font',
'imake', 'ccache', 'wget',
'gcc472_0moz1', 'gcc473_0moz1',
- 'freetype-2.3.11-6.el6_2.9', 'freetype-devel-2.3.11-6.el6_2.9',
- 'gstreamer-devel', 'gstreamer-plugins-base-devel'],
+ 'freetype-2.3.11-6.el6_1.8.i686', 'freetype-devel-2.3.11-6.el6_1.8.i686',
+ 'freetype-2.3.11-6.el6_1.8.x86_64',
+ 'gstreamer-devel.i686', 'gstreamer-plugins-base-devel.i686',
+ # Packages already installed in the mock environment, as x86_64
+ # packages.
+ 'glibc-devel.i686', 'libgcc.i686', 'libstdc++-devel.i686',
+ # yum likes to install .x86_64 -devel packages that satisfy .i686
+ # -devel packages dependencies. So manually install the dependencies
+ # of the above packages.
+ 'ORBit2-devel.i686', 'atk-devel.i686', 'cairo-devel.i686',
+ 'check-devel.i686', 'dbus-devel.i686', 'dbus-glib-devel.i686',
+ 'fontconfig-devel.i686', 'glib2-devel.i686',
+ 'hal-devel.i686', 'libICE-devel.i686', 'libIDL-devel.i686',
+ 'libSM-devel.i686', 'libXau-devel.i686', 'libXcomposite-devel.i686',
+ 'libXcursor-devel.i686', 'libXdamage-devel.i686', 'libXdmcp-devel.i686',
+ 'libXext-devel.i686', 'libXfixes-devel.i686', 'libXft-devel.i686',
+ 'libXi-devel.i686', 'libXinerama-devel.i686', 'libXrandr-devel.i686',
+ 'libXrender-devel.i686', 'libXxf86vm-devel.i686', 'libdrm-devel.i686',
+ 'libidn-devel.i686', 'libpng-devel.i686', 'libxcb-devel.i686',
+ 'libxml2-devel.i686', 'pango-devel.i686', 'perl-devel.i686',
+ 'pixman-devel.i686', 'zlib-devel.i686',
+ # Packages necessary to run host xpcshell
+ 'libXt.x86_64',
+ ],
'tooltool_manifest_src': 'b2g/config/tooltool-manifests/linux32/releng.manifest',
'gaia_repo': gaia_repo,
'gaia_revision_file': gaia_revision_file,
'gaia_languages_file': 'locales/languages_dev.json',
'mock_copyin_files': [
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.boto', '/builds/.boto'),
@@ -770,27 +814,49 @@ PLATFORM_VARS = {
'WGET_OPTS': '-q -c',
},
'enable_opt_unittests': False,
'enable_checktests': False,
'enable_build_analysis': True,
'test_pretty_names': False,
'l10n_check_test': False,
'use_mock': True,
- 'mock_target': 'mozilla-centos6-i386',
+ 'mock_target': 'mozilla-centos6-x86_64',
'mock_packages': ['autoconf213', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
- 'glibc-static', 'libstdc++-static', 'gtk2-devel',
- 'libnotify-devel', 'yasm', 'alsa-lib-devel',
- 'libcurl-devel', 'wireless-tools-devel',
- 'libX11-devel', 'libXt-devel', 'mesa-libGL-devel',
- 'gnome-vfs2-devel', 'mpfr', 'xorg-x11-font',
+ 'glibc-static.i686', 'libstdc++-static.i686', 'perl-Test-Simple',
+ 'perl-Config-General', 'gtk2-devel.i686', 'libnotify-devel.i686',
+ 'yasm', 'alsa-lib-devel.i686', 'libcurl-devel.i686', 'wireless-tools-devel.i686',
+ 'libX11-devel.i686', 'libXt-devel.i686', 'mesa-libGL-devel.i686',
+ 'gnome-vfs2-devel.i686', 'mpfr', 'xorg-x11-font',
'imake', 'ccache', 'wget',
- 'freetype-2.3.11-6.el6_2.9', 'freetype-devel-2.3.11-6.el6_2.9',
- 'gstreamer-devel', 'gstreamer-plugins-base-devel',
- 'gcc472_0moz1', 'gcc473_0moz1'],
+ 'gcc472_0moz1', 'gcc473_0moz1',
+ 'freetype-2.3.11-6.el6_1.8.i686', 'freetype-devel-2.3.11-6.el6_1.8.i686',
+ 'freetype-2.3.11-6.el6_1.8.x86_64',
+ 'gstreamer-devel.i686', 'gstreamer-plugins-base-devel.i686',
+ # Packages already installed in the mock environment, as x86_64
+ # packages.
+ 'glibc-devel.i686', 'libgcc.i686', 'libstdc++-devel.i686',
+ # yum likes to install .x86_64 -devel packages that satisfy .i686
+ # -devel packages dependencies. So manually install the dependencies
+ # of the above packages.
+ 'ORBit2-devel.i686', 'atk-devel.i686', 'cairo-devel.i686',
+ 'check-devel.i686', 'dbus-devel.i686', 'dbus-glib-devel.i686',
+ 'fontconfig-devel.i686', 'glib2-devel.i686',
+ 'hal-devel.i686', 'libICE-devel.i686', 'libIDL-devel.i686',
+ 'libSM-devel.i686', 'libXau-devel.i686', 'libXcomposite-devel.i686',
+ 'libXcursor-devel.i686', 'libXdamage-devel.i686', 'libXdmcp-devel.i686',
+ 'libXext-devel.i686', 'libXfixes-devel.i686', 'libXft-devel.i686',
+ 'libXi-devel.i686', 'libXinerama-devel.i686', 'libXrandr-devel.i686',
+ 'libXrender-devel.i686', 'libXxf86vm-devel.i686', 'libdrm-devel.i686',
+ 'libidn-devel.i686', 'libpng-devel.i686', 'libxcb-devel.i686',
+ 'libxml2-devel.i686', 'pango-devel.i686', 'perl-devel.i686',
+ 'pixman-devel.i686', 'zlib-devel.i686',
+ # Packages necessary to run host xpcshell
+ 'libXt.x86_64',
+ ],
'tooltool_manifest_src': 'b2g/config/tooltool-manifests/linux32/releng.manifest',
'gaia_repo': gaia_repo,
'gaia_revision_file': gaia_revision_file,
'gaia_languages_file': 'locales/languages_all.json',
'mock_copyin_files': [
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.boto', '/builds/.boto'),