Skip to content

Commit

Permalink
[build] Downgrade Linux sysroots from bullseye to stretch.
Browse files Browse the repository at this point in the history
Change-Id: Ic53f86cd2c96626297f6059bdf3a04f451207439
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/254283
Commit-Queue: Alexander Thomas <athom@google.com>
Auto-Submit: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
  • Loading branch information
rmacnak-google authored and Commit Bot committed Aug 10, 2022
1 parent 812b9c9 commit 2e2d45f
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 40 deletions.
10 changes: 5 additions & 5 deletions build/.gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated file containing information about the VS toolchain on Windows
win_toolchain.json

# Pulled Debian bullseye sysroots
linux/debian_bullseye_arm-sysroot
linux/debian_bullseye_arm64-sysroot
linux/debian_bullseye_amd64-sysroot
linux/debian_bullseye_i386-sysroot
# Pulled Debian stretch sysroots
linux/debian_stretch_arm-sysroot
linux/debian_stretch_arm64-sysroot
linux/debian_stretch_amd64-sysroot
linux/debian_stretch_i386-sysroot
8 changes: 4 additions & 4 deletions build/config/sysroot.gni
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ declare_args() {
if (is_linux && dart_use_debian_sysroot) {
if (current_cpu == "x86") {
target_sysroot =
rebase_path("//build/linux/debian_bullseye_i386-sysroot", root_build_dir)
rebase_path("//build/linux/debian_stretch_i386-sysroot", root_build_dir)
} else if (current_cpu == "x64") {
target_sysroot =
rebase_path("//build/linux/debian_bullseye_amd64-sysroot", root_build_dir)
rebase_path("//build/linux/debian_stretch_amd64-sysroot", root_build_dir)
} else if (current_cpu == "arm") {
target_sysroot =
rebase_path("//build/linux/debian_bullseye_arm-sysroot", root_build_dir)
rebase_path("//build/linux/debian_stretch_arm-sysroot", root_build_dir)
} else if (current_cpu == "arm64") {
target_sysroot =
rebase_path("//build/linux/debian_bullseye_arm64-sysroot", root_build_dir)
rebase_path("//build/linux/debian_stretch_arm64-sysroot", root_build_dir)
} else {
print("There is no Debian sysroot present for $current_cpu")
assert(false)
Expand Down
5 changes: 3 additions & 2 deletions build/linux/sysroot_scripts/install-sysroot.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
'mips64': 'mips64el',
}

DEFAULT_TARGET_PLATFORM = 'bullseye'
DEFAULT_TARGET_PLATFORM = 'stretch'


class Error(Exception):
Expand Down Expand Up @@ -116,14 +116,15 @@ def GetSysrootDict(target_platform, target_arch):

def InstallSysroot(target_platform, target_arch):
sysroot_dict = GetSysrootDict(target_platform, target_arch)
revision = sysroot_dict['Revision']
tarball_filename = sysroot_dict['Tarball']
tarball_sha1sum = sysroot_dict['Sha1Sum']
# TODO(thestig) Consider putting this elsewhere to avoid having to recreate
# it on every build.
linux_dir = os.path.dirname(SCRIPT_DIR)
sysroot = os.path.join(linux_dir, sysroot_dict['SysrootDir'])

url = '%s/%s/%s/%s' % (URL_PREFIX, URL_PATH, tarball_sha1sum,
url = '%s/%s/%s/%s' % (URL_PREFIX, URL_PATH, revision,
tarball_filename)

stamp = os.path.join(sysroot, '.stamp')
Expand Down
59 changes: 30 additions & 29 deletions build/linux/sysroot_scripts/sysroots.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,38 @@
{
"bullseye_amd64": {
"Sha1Sum": "cb4fa34f1faddafb72cace35faf62a611f2ca7c9",
"SysrootDir": "debian_bullseye_amd64-sysroot",
"Tarball": "debian_bullseye_amd64_sysroot.tar.xz"
"stretch_amd64": {
"Revision": "1126d9b629c97385a503debac7a1b59e60a3ab1b",
"Sha1Sum": "a73bcd43fc4910afe264f730f7c06f5ef5c965cd",
"SysrootDir": "debian_stretch_amd64-sysroot",
"Tarball": "debian_stretch_amd64_sysroot.tar.xz"
},
"bullseye_arm": {
"Sha1Sum": "a1084eba943f797a1c9aee8d5f8213ed680315a8",
"SysrootDir": "debian_bullseye_arm-sysroot",
"Tarball": "debian_bullseye_arm_sysroot.tar.xz"
"stretch_arm": {
"Revision": "1126d9b629c97385a503debac7a1b59e60a3ab1b",
"Sha1Sum": "7c5c22fbfca6fd825a63363bc906fbfa800d7f95",
"SysrootDir": "debian_stretch_arm-sysroot",
"Tarball": "debian_stretch_arm_sysroot.tar.xz"
},
"bullseye_arm64": {
"Sha1Sum": "f00ece500aef0ff2a431a07de48bd3e1aa6d1caf",
"SysrootDir": "debian_bullseye_arm64-sysroot",
"Tarball": "debian_bullseye_arm64_sysroot.tar.xz"
"stretch_arm64": {
"Revision": "1126d9b629c97385a503debac7a1b59e60a3ab1b",
"Sha1Sum": "ab8063f2d9d6b777797653041851c3f9274a33af",
"SysrootDir": "debian_stretch_arm64-sysroot",
"Tarball": "debian_stretch_arm64_sysroot.tar.xz"
},
"bullseye_armel": {
"Sha1Sum": "54ccf4898fe923b22141c9e21e80b455dec47ecf",
"SysrootDir": "debian_bullseye_armel-sysroot",
"Tarball": "debian_bullseye_armel_sysroot.tar.xz"
"stretch_i386": {
"Revision": "1126d9b629c97385a503debac7a1b59e60a3ab1b",
"Sha1Sum": "72ed2ce337bd40e8e7a89e5501b0b63050453d6c",
"SysrootDir": "debian_stretch_i386-sysroot",
"Tarball": "debian_stretch_i386_sysroot.tar.xz"
},
"bullseye_i386": {
"Sha1Sum": "07bb72368889fea19a1f123aa11528f0d792121b",
"SysrootDir": "debian_bullseye_i386-sysroot",
"Tarball": "debian_bullseye_i386_sysroot.tar.xz"
"stretch_mips": {
"Revision": "1126d9b629c97385a503debac7a1b59e60a3ab1b",
"Sha1Sum": "fe5949ed3795aa64913a27389052637ea2629da3",
"SysrootDir": "debian_stretch_mips-sysroot",
"Tarball": "debian_stretch_mips_sysroot.tar.xz"
},
"bullseye_mips": {
"Sha1Sum": "f19f07f7e62edbf837d6e7f173aea3f47110c2ba",
"SysrootDir": "debian_bullseye_mips-sysroot",
"Tarball": "debian_bullseye_mips_sysroot.tar.xz"
},
"bullseye_mips64el": {
"Sha1Sum": "3cfc9e7fe2d0cad3873bbce8fc3ffde510ed5638",
"SysrootDir": "debian_bullseye_mips64el-sysroot",
"Tarball": "debian_bullseye_mips64el_sysroot.tar.xz"
"stretch_mips64el": {
"Revision": "1126d9b629c97385a503debac7a1b59e60a3ab1b",
"Sha1Sum": "5d95b45a9633c3c874d3ab9326306b0e951f01f1",
"SysrootDir": "debian_stretch_mips64el-sysroot",
"Tarball": "debian_stretch_mips64el_sysroot.tar.xz"
}
}

0 comments on commit 2e2d45f

Please sign in to comment.