зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1411196 - Make |mach bootstrap| on Gentoo use the latest version of Oracle's JDK for Fennec builds; r=froydnj
MozReview-Commit-ID: 7bUtundkBZU --HG-- extra : source : dc1e64ab4995a17b52181ab703d9e0f5aea71d75
This commit is contained in:
Родитель
24d7896fa3
Коммит
d2bf4663bd
|
@ -49,17 +49,20 @@ class GentooBootstrapper(StyloInstall, BaseBootstrapper):
|
|||
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,
|
||||
|
|
Загрузка…
Ссылка в новой задаче