From c03ed6d3a17e42aa048fbaabcfb32677cfe63d8b Mon Sep 17 00:00:00 2001
From: Samuel Attard <sattard@slack-corp.com>
Date: Tue, 29 Oct 2019 17:50:24 -0700
Subject: [PATCH] build: change to download sysroots from the new sysroot
 bucket (#20803)

* build: change to download sysroots from the new sysroot bucket

* build: add json config files to deps hash to can influence the src dir

* build: update to latest sysroot hash
---
 patches/chromium/sysroot.patch |  2 +-
 script/generate-deps-hash.js   |  4 +++-
 script/sysroots.json           | 17 +++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/patches/chromium/sysroot.patch b/patches/chromium/sysroot.patch
index 3ab278bb01..5c98f6d4b7 100644
--- a/patches/chromium/sysroot.patch
+++ b/patches/chromium/sysroot.patch
@@ -20,7 +20,7 @@ index 165551a2948b74c024459be42d1a9a3d96878a10..5c9272a512e22dfe2e90f6665083f53f
 -URL_PREFIX = 'https://commondatastorage.googleapis.com'
 -URL_PATH = 'chrome-linux-sysroot/toolchain'
 +URL_PREFIX = 'http://s3.amazonaws.com'
-+URL_PATH = 'gh-contractor-zcbenz/toolchain'
++URL_PATH = 'electronjs-sysroots/toolchain'
  
  VALID_ARCHS = ('arm', 'arm64', 'i386', 'amd64', 'mips', 'mips64el')
  
diff --git a/script/generate-deps-hash.js b/script/generate-deps-hash.js
index b6cc316f60..df5dc2a9f0 100644
--- a/script/generate-deps-hash.js
+++ b/script/generate-deps-hash.js
@@ -8,7 +8,9 @@ const HASH_VERSION = 1
 // Base files to hash
 const filesToHash = [
   path.resolve(__dirname, '../DEPS'),
-  path.resolve(__dirname, '../yarn.lock')
+  path.resolve(__dirname, '../yarn.lock'),
+  path.resolve(__dirname, '../script/external-binaries.json'),
+  path.resolve(__dirname, '../script/sysroots.json')
 ]
 
 const addAllFiles = (dir) => {
diff --git a/script/sysroots.json b/script/sysroots.json
index b892ba4de5..906cdbb8e3 100644
--- a/script/sysroots.json
+++ b/script/sysroots.json
@@ -1,31 +1,36 @@
 {
     "sid_amd64": {
-        "Sha1Sum": "b1b67071a9850ecba2ee8de0762e0edc0981a1cb",
+        "Sha1Sum": "6861827d4063f8792d691252981d515522c6cb6c",
         "SysrootDir": "debian_sid_amd64-sysroot",
         "Tarball": "debian_sid_amd64_sysroot.tar.xz"
     },
     "sid_arm": {
-        "Sha1Sum": "947372fe8669d2ceb4560550b13a99761b40772b",
+        "Sha1Sum": "20d8e848cde8d656d0fff55ed2b48c78d64f1933",
         "SysrootDir": "debian_sid_arm-sysroot",
         "Tarball": "debian_sid_arm_sysroot.tar.xz"
     },
     "sid_arm64": {
-        "Sha1Sum": "2961cef580d6be189c506843e3b585216394a7c2",
+        "Sha1Sum": "1494a55afc3186ea0073ae9cc76d3121e81caccb",
         "SysrootDir": "debian_sid_arm64-sysroot",
         "Tarball": "debian_sid_arm64_sysroot.tar.xz"
     },
+    "sid_armel": {
+        "Sha1Sum": "60689376d06a4c613f031ddb6e4e6d192bcc03a7",
+        "SysrootDir": "debian_sid_armel-sysroot",
+        "Tarball": "debian_sid_armel_sysroot.tar.xz"
+    },
     "sid_i386": {
-        "Sha1Sum": "87c33fef40aa9d7b35961eecb489ecee83e2dc39",
+        "Sha1Sum": "eb4f827ec5b643ae60136417f3777888e8a81322",
         "SysrootDir": "debian_sid_i386-sysroot",
         "Tarball": "debian_sid_i386_sysroot.tar.xz"
     },
     "sid_mips": {
-        "Sha1Sum": "436fc9638e2a435fa824d2f27dacc9e39d5ba667",
+        "Sha1Sum": "3b91b58c733ecc2de9989d98e00b010625d77c6c",
         "SysrootDir": "debian_sid_mips-sysroot",
         "Tarball": "debian_sid_mips_sysroot.tar.xz"
     },
     "sid_mips64el": {
-        "Sha1Sum": "4dce782d88fa115c9503944f5d3af649ce35a593",
+        "Sha1Sum": "240d0ee7151061574e06fe69d45894e36c57c5bf",
         "SysrootDir": "debian_sid_mips64el-sysroot",
         "Tarball": "debian_sid_mips64el_sysroot.tar.xz"
     }