diff options
| author | Jordan Bayles <jophba@chromium.org> | 2020-04-08 09:11:33 -0700 |
|---|---|---|
| committer | Jordan Bayles <jophba@chromium.org> | 2020-04-08 16:13:26 +0000 |
| commit | c569064a9e0b678dfe9d470224a87d4517059844 (patch) | |
| tree | 0f2b013c97a4adc3eb27897d8faecc3e36802605 /build | |
| parent | 59fcc7c0b7eb9af830bb58daf46c53008fe0ddc4 (diff) | |
| download | openscreen-c569064a9e0b678dfe9d470224a87d4517059844.tar.gz | |
Move from jessie to strech
This patch removes the jessie sysroots, which are too old for the C++
features that we use, in favor of new stretch sysroots that I generated
by pulling an old version of chromium/src and using the
sysroot-creator.sh script with a stretch package configuration.
TBR due to buildbucket.cfg changes, trying to get the bot landed today.
TBR=btolsch@chromium.org
Change-Id: I6dfae987c4be6aae24386ede3abe33d01596821e
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2142317
Reviewed-by: Jordan Bayles <jophba@chromium.org>
Diffstat (limited to 'build')
| -rw-r--r-- | build/config/sysroot.gni | 2 | ||||
| -rwxr-xr-x | build/scripts/install-sysroot.py | 2 | ||||
| -rw-r--r-- | build/scripts/sysroots.json | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni index a25e0e60..c5f2d549 100644 --- a/build/config/sysroot.gni +++ b/build/config/sysroot.gni @@ -18,7 +18,7 @@ declare_args() { } if (use_sysroot) { - assert(sysroot_platform == "sid" || sysroot_platform == "jessie") + assert(sysroot_platform == "sid" || sysroot_platform == "stretch") assert(current_cpu == "arm" || current_cpu == "arm64") # By default build against a sysroot image downloaded from Cloud Storage diff --git a/build/scripts/install-sysroot.py b/build/scripts/install-sysroot.py index 363103fc..53b28783 100755 --- a/build/scripts/install-sysroot.py +++ b/build/scripts/install-sysroot.py @@ -44,7 +44,7 @@ URL_PREFIX = 'https://storage.googleapis.com' URL_PATH = 'openscreen-sysroots' VALID_ARCHS = ('arm', 'arm64') -VALID_PLATFORMS = ('jessie', 'sid') +VALID_PLATFORMS = ('stretch', 'sid') class Error(Exception): diff --git a/build/scripts/sysroots.json b/build/scripts/sysroots.json index f2ca08af..193e9412 100644 --- a/build/scripts/sysroots.json +++ b/build/scripts/sysroots.json @@ -1,13 +1,13 @@ { - "jessie_arm": { - "Sha1Sum": "5565736d389d834938b238bf6391a7facef1c26f", - "SysrootDir": "debian_jessie_arm-sysroot", - "Tarball": "debian_jessie_arm_sysroot.tar.xz" + "stretch_arm": { + "Sha1Sum": "407ba17bd8a686d1c82dadb593579325e4b9cd61", + "SysrootDir": "debian_stretch_arm-sysroot", + "Tarball": "debian_stretch_arm_sysroot.tar.xz" }, - "jessie_arm64": { - "Sha1Sum": "6281c416ea24fdb4d1e5c411feb7cc88eb87aecd", - "SysrootDir": "debian_jessie_arm64-sysroot", - "Tarball": "debian_jessie_arm64_sysroot.tar.xz" + "stretch_arm64": { + "Sha1Sum": "5523478d833a735643c0a36feed5d89a1f70846b", + "SysrootDir": "debian_stretch_arm64-sysroot", + "Tarball": "debian_stretch_arm64_sysroot.tar.xz" }, "sid_arm": { "Sha1Sum": "07ef353ec66ca510a9b24a927db823e44435c764", |