From 0f694f408cfb05080189df4490c6f3d8448fb27d Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 7 Apr 2020 16:49:54 -0400 Subject: [PATCH 1/3] Pull a sysroot on Linux This rolls DEPS to pick up the new buildroot sysroot scripts, and uses them to download a sysroot on Linux. The sysroot isn't yet used by default; that will be added in a later PR. Part of https://github.com/flutter/flutter/issues/53176 --- DEPS | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index f84a6c5b49cec..059545f9d4d0b 100644 --- a/DEPS +++ b/DEPS @@ -113,6 +113,9 @@ vars = { # Checkout Windows dependencies only if we are building on Windows. 'download_windows_deps' : 'host_os == "win"', + # Checkout Linux dependencies only when building on Linux. + 'download_linux_deps': 'host_os == "linux"', + # An LLVM backend needs LLVM binaries and headers. To avoid build time # increases we can use prebuilts. We don't want to download this on every # CQ/CI bot nor do we want the average Dart developer to incur that cost. @@ -136,7 +139,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '3a27de1c5bb0f50be7d3efe3e00de4f6068c9f30', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '74eedc7f351b2b8c323468c4487b1b5e9b08f0aa', # Fuchsia compatibility # @@ -622,4 +625,13 @@ hooks = [ 'src/third_party/dart/third_party/7zip.tar.gz.sha1', ], }, + { + 'name': 'linux_sysroot', + 'pattern': '.', + 'condition': 'download_linux_deps', + 'action': [ + 'python', + 'src/build/linux/sysroot_scripts/install-sysroot.py', + '--arch=x64'], + }, ] From 61ec0ac56b8bd54b9885fc29a55c2adf7b405b2f Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 7 Apr 2020 17:37:19 -0400 Subject: [PATCH 2/3] sysroot buildroot PR test; not for committing --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 059545f9d4d0b..89f934a976f4d 100644 --- a/DEPS +++ b/DEPS @@ -139,7 +139,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '74eedc7f351b2b8c323468c4487b1b5e9b08f0aa', + 'src': 'https://github.com/stuartmorgan/buildroot.git' + '@' + '00cc70148cfff591e10c082f55165fa2a21c680f', # Fuchsia compatibility # From 80dc34f4cb72204ca1b102299686700318baf57f Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Tue, 7 Apr 2020 19:23:16 -0700 Subject: [PATCH 3/3] Point to actual buildroot commit --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 89f934a976f4d..026c6eb4b6e52 100644 --- a/DEPS +++ b/DEPS @@ -139,7 +139,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/stuartmorgan/buildroot.git' + '@' + '00cc70148cfff591e10c082f55165fa2a21c680f', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '0c64fd23eeedbad60c2bfa294710cd587ccb7c27', # Fuchsia compatibility #