| Index: build/linux/sysroot_scripts/install-sysroot.py
|
| diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
|
| index 13b089120680ff3274b8f18763baebf964b6b23d..240bc89cc076e8f84b9063fa7408e6bd43bbd7a1 100755
|
| --- a/build/linux/sysroot_scripts/install-sysroot.py
|
| +++ b/build/linux/sysroot_scripts/install-sysroot.py
|
| @@ -38,34 +38,34 @@ URL_PREFIX = 'https://commondatastorage.googleapis.com'
|
| URL_PATH = 'chrome-linux-sysroot/toolchain'
|
|
|
| SYSROOTS = {
|
| - ('Wheezy', 'amd64'): {
|
| - 'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
|
| - 'Tarball' : 'debian_wheezy_amd64_sysroot.tgz',
|
| - 'Sha1Sum' : 'cc43f16c817fbb8c525405363ece863347210a30',
|
| - 'SysrootDir' : 'debian_wheezy_amd64-sysroot'
|
| + ('Jessie', 'amd64'): {
|
| + 'Revision' : '9f61b42c2dffb6122926aaa27cd9aeb5739140d3',
|
| + 'Tarball' : 'debian_jessie_amd64_sysroot.tgz',
|
| + 'Sha1Sum' : 'e025b5e60c129dc424edb3a74874fe289cfc216e',
|
| + 'SysrootDir' : 'debian_jessie_amd64-sysroot'
|
| },
|
| - ('Wheezy', 'arm'): {
|
| - 'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
|
| - 'Tarball' : 'debian_wheezy_arm_sysroot.tgz',
|
| - 'Sha1Sum' : 'c09ac9576642d81209f25cde19a64f427b5fbaf8',
|
| - 'SysrootDir' : 'debian_wheezy_arm-sysroot'
|
| + ('Jessie', 'arm'): {
|
| + 'Revision' : '9f61b42c2dffb6122926aaa27cd9aeb5739140d3',
|
| + 'Tarball' : 'debian_jessie_arm_sysroot.tgz',
|
| + 'Sha1Sum' : '53b8c516cfffa0ee8ec3a6eb14260dcae26dc4cd',
|
| + 'SysrootDir' : 'debian_jessie_arm-sysroot'
|
| },
|
| - ('Wheezy', 'i386'): {
|
| - 'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
|
| - 'Tarball' : 'debian_wheezy_i386_sysroot.tgz',
|
| - 'Sha1Sum' : '1b28326d17094b9d3616579b988eb5554c3dc9f8',
|
| - 'SysrootDir' : 'debian_wheezy_i386-sysroot'
|
| + ('Jessie', 'i386'): {
|
| + 'Revision' : '9f61b42c2dffb6122926aaa27cd9aeb5739140d3',
|
| + 'Tarball' : 'debian_jessie_i386_sysroot.tgz',
|
| + 'Sha1Sum' : '3a2277b561a6348fcf4fc17abd1ccc44e8eac77f',
|
| + 'SysrootDir' : 'debian_jessie_i386-sysroot'
|
| },
|
| - ('Wheezy', 'mips'): {
|
| - 'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
|
| - 'Tarball' : 'debian_wheezy_mips_sysroot.tgz',
|
| - 'Sha1Sum' : 'c0948a2c955588079dc31d688e8105730744ef45',
|
| - 'SysrootDir' : 'debian_wheezy_mips-sysroot'
|
| + ('Jessie', 'mips'): {
|
| + 'Revision' : '9f61b42c2dffb6122926aaa27cd9aeb5739140d3',
|
| + 'Tarball' : 'debian_jessie_mips_sysroot.tgz',
|
| + 'Sha1Sum' : '11ccc3ee056f185d8f1f9b0d41822fbd9f4c4013',
|
| + 'SysrootDir' : 'debian_jessie_mips-sysroot'
|
| },
|
| ('Jessie', 'arm64'): {
|
| - 'Revision' : '5735a5e9605d549acb6495e1fb65384a54fe0a48',
|
| + 'Revision' : '9f61b42c2dffb6122926aaa27cd9aeb5739140d3',
|
| 'Tarball' : 'debian_jessie_arm64_sysroot.tgz',
|
| - 'Sha1Sum' : '82ebae900d0aadd52cf76a8e7cdb6a782df6ef28',
|
| + 'Sha1Sum' : '8c9656da2017b45b7890b1ab10894ff686cf0517',
|
| 'SysrootDir' : 'debian_jessie_arm64-sysroot'
|
| },
|
| ('Precise', 'amd64'): {
|
| @@ -181,6 +181,9 @@ def main(args):
|
| ' Installs default sysroot images.')
|
| parser.add_option('--arch', type='choice', choices=valid_archs,
|
| help='Sysroot architecture: %s' % ', '.join(valid_archs))
|
| + parser.add_option('--all', action='store_true',
|
| + help='Install all sysroot images (useful when updating the'
|
| + ' images)')
|
| options, _ = parser.parse_args(args)
|
| if options.running_as_hook and not sys.platform.startswith('linux'):
|
| return 0
|
| @@ -192,24 +195,28 @@ def main(args):
|
| return 0
|
| InstallDefaultSysroots(host_arch)
|
| else:
|
| - if not options.arch:
|
| + if options.arch:
|
| + InstallDefaultSysrootForArch(options.arch)
|
| + elif options.all:
|
| + for arch in valid_archs:
|
| + InstallDefaultSysrootForArch(arch)
|
| + else:
|
| print 'You much specify either --arch or --running-as-hook'
|
| return 1
|
| - InstallDefaultSysrootForArch(options.arch)
|
|
|
| return 0
|
|
|
| def InstallDefaultSysrootForArch(target_arch):
|
| if target_arch == 'amd64':
|
| - InstallSysroot('Wheezy', 'amd64')
|
| + InstallSysroot('Jessie', 'amd64')
|
| elif target_arch == 'arm':
|
| - InstallSysroot('Wheezy', 'arm')
|
| + InstallSysroot('Jessie', 'arm')
|
| elif target_arch == 'arm64':
|
| InstallSysroot('Jessie', 'arm64')
|
| elif target_arch == 'i386':
|
| - InstallSysroot('Wheezy', 'i386')
|
| + InstallSysroot('Jessie', 'i386')
|
| elif target_arch == 'mips':
|
| - InstallSysroot('Wheezy', 'mips')
|
| + InstallSysroot('Jessie', 'mips')
|
| else:
|
| raise Error('Unknown architecture: %s' % target_arch)
|
|
|
|
|