Bug 1512882 - CentOS 7 Bootstrap Fix. r=frg a=frg DONTBUILD CLOSED TREE SEAMONKEY_2_49_ESR_RELBRANCH
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 15 Jul 2019 18:07:58 +0200
branchSEAMONKEY_2_49_ESR_RELBRANCH
changeset 357556 0a7fa4f920705845b8fd50c38fe7bb9b72b5a869
parent 357555 a12fb72304a6e813087fa328b8f0b91d9a307b92
child 357557 65825fac321f21f865e50b7c09aaa968c040d2c4
push id7836
push userfrgrahl@gmx.net
push dateMon, 15 Jul 2019 16:17:02 +0000
treeherdermozilla-esr52@3a4afe7ecac5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg, frg
bugs1512882
milestone52.9.1
Bug 1512882 - CentOS 7 Bootstrap Fix. r=frg a=frg DONTBUILD CLOSED TREE SeaMonkey ESR52 release branch only.
python/mozboot/mozboot/centosfedora.py
--- a/python/mozboot/mozboot/centosfedora.py
+++ b/python/mozboot/mozboot/centosfedora.py
@@ -8,17 +8,17 @@ import platform
 from mozboot.base import BaseBootstrapper
 
 
 class CentOSFedoraBootstrapper(BaseBootstrapper):
     def __init__(self, distro, version, dist_id, **kwargs):
         BaseBootstrapper.__init__(self, **kwargs)
 
         self.distro = distro
-        self.version = version
+        self.version = int(version.split('.')[0])
         self.dist_id = dist_id
 
         self.group_packages = []
 
         self.packages = [
             'autoconf213',
             'mercurial',
         ]
@@ -41,29 +41,43 @@ class CentOSFedoraBootstrapper(BaseBoots
             'yasm',
         ]
 
         self.mobile_android_packages = []
 
         if self.distro in ('CentOS', 'CentOS Linux'):
             self.group_packages += [
                 'Development Tools',
-                'Development Libraries',
-                'GNOME Software Development',
             ]
 
             self.packages += [
                 'curl-devel',
             ]
 
             self.browser_packages += [
                 'dbus-glib-devel',
+                'gcc-c++',
                 'gtk3-devel',
             ]
 
+            if self.version == 6:
+                self.group_packages += [
+                    'Development Libraries',
+                    'GNOME Software Development',
+                ]
+
+            elif self.version == 7:
+                self.packages += [
+                    'python2-devel',
+                ]
+
+                self.browser_group_packages = [
+                    'Development Tools',
+                ]
+
         elif self.distro == 'Fedora':
             self.group_packages += [
                 'C Development Tools and Libraries',
             ]
 
             self.packages += [
                 'python2-devel',
             ]
@@ -101,17 +115,17 @@ class CentOSFedoraBootstrapper(BaseBoots
         elif self.distro == 'Fedora':
             self.install_fedora_mobile_android_packages(artifact_mode=True)
 
     def ensure_browser_packages(self, artifact_mode=False):
         # TODO: Figure out what not to install for artifact mode
         self.dnf_groupinstall(*self.browser_group_packages)
         self.dnf_install(*self.browser_packages)
 
-        if self.distro in ('CentOS', 'CentOS Linux'):
+        if self.distro in ('CentOS', 'CentOS Linux')  and self.version == 6:
             yasm = 'http://pkgs.repoforge.org/yasm/yasm-1.1.0-1.el6.rf.i686.rpm'
             if platform.architecture()[0] == '64bit':
                 yasm = 'http://pkgs.repoforge.org/yasm/yasm-1.1.0-1.el6.rf.x86_64.rpm'
 
             self.run_as_root(['rpm', '-ivh', yasm])
 
     def install_fedora_mobile_android_packages(self, artifact_mode=False):
         import android