Bug 1411196 - Make |mach bootstrap| on Gentoo use the latest version of Oracle's JDK for Fennec builds; r=froydnj
authorGabriele Svelto <gsvelto@mozilla.com>
Tue, 24 Oct 2017 11:15:16 +0200
changeset 387873 2fb0bb12c7b05aff0ce7b71c41feb26e257c262a
parent 387872 4104997aea0c64240199ca7fa1363ace9d2e05f8
child 387874 1477d8efa5693122a0f713c89dd4d353dd902922
push id32738
push userarchaeopteryx@coole-files.de
push dateTue, 24 Oct 2017 21:58:00 +0000
treeherdermozilla-central@a124f4901430 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1411196
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1411196 - Make |mach bootstrap| on Gentoo use the latest version of Oracle's JDK for Fennec builds; r=froydnj MozReview-Commit-ID: 7bUtundkBZU
python/mozboot/mozboot/gentoo.py
--- a/python/mozboot/mozboot/gentoo.py
+++ b/python/mozboot/mozboot/gentoo.py
@@ -44,27 +44,30 @@ class GentooBootstrapper(StyloInstall, B
         self.run_as_root(['emerge', '--noreplace', '--quiet', 'wget'])
 
         # Obtain the path held in the DISTDIR portage variable
         emerge_info = subprocess.check_output(['emerge', '--info'])
         distdir_re = re.compile('^DISTDIR="(.*)"$', re.MULTILINE)
         distdir = distdir_re.search(emerge_info).group(1)
 
         # Fetch the Oracle JDK since portage can't fetch it on its own
-        jdk_file = 'jdk-8u144-linux-x64.tar.gz'
+        base_url = 'http://download.oracle.com/otn-pub/java/jdk'
+        jdk_dir = '8u152-b16/aa0333dd3019491ca4f6ddbe78cdb6d0'
+        jdk_file = 'jdk-8u152-linux-x64.tar.gz'
+        cookie = 'Cookie: oraclelicense=accept-securebackup-cookie'
         self.run_as_root(['wget', '-c', '-O', distdir + '/' + jdk_file,
-                          '--header', 'Cookie: oraclelicense=accept-securebackup-cookie',
-                          'http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/' + jdk_file])  # noqa
+                          '--header', cookie,
+                          base_url + '/' + jdk_dir + '/' + jdk_file])
 
         # Install the Oracle JDK. We explicitly prompt the user to accept the
         # changes because this command might need to modify the portage
         # configuration files and doing so without user supervision is dangerous
         self.run_as_root(['emerge', '--noreplace', '--quiet',
                           '--autounmask-continue', '--ask',
-                          '=dev-java/oracle-jdk-bin-1.8.0.144'])
+                          '=dev-java/oracle-jdk-bin-1.8.0.152-r1'])
 
         from mozboot import android
         android.ensure_android('linux', artifact_mode=artifact_mode,
                                no_interactive=self.no_interactive)
 
     def suggest_mobile_android_mozconfig(self, artifact_mode=False):
         from mozboot import android
         android.suggest_mozconfig('linux', artifact_mode=artifact_mode)