chromium/src
0
Fork 0
Code Activity

Rebuild sysroots

Browse Source 
A previous sysroot roll was causing issue 392321375 since sysroots
with identical hashes were uploaded (caused by sysroot builds now being
reproducible).  This caused a change in the "generation" key in GCS but
didn't change the "sha256sum" key, which was causing an internal GCS
issue.

This CL updates the sysroots (just the timestamp -- no packages have
actually changed) to change the hashes and reuploads them.
It also removes the --force flag from upload_to_google_storage.py to
prevent this issue in the future.

R=thestig
CC=​​sokcevic

Change-Id: Ifde201e60aaac4c55af8e4fcb614a664c688174e
Bug: 392321375
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6215904
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1413189}
This commit is contained in:
Tom Anderson
2025-01-29 14:51:12 -08:00
committed by Chromium LUCI CQ
parent 310ecc6ca6
commit 964fb22210
12 changed files with 4514 additions and 4515 deletions

56
DEPS

@ -571,10 +571,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999137081655,
'object_name': '288167cb6072e53141241227e60bc7024ff4eccb3dabf53633a20ce4f5c8217e',
'sha256sum': '288167cb6072e53141241227e60bc7024ff4eccb3dabf53633a20ce4f5c8217e',
'size_bytes': 19724468,
'generation': 1738186811481804,
'object_name': 'ac6166be1352e9e66a7574e0d6891c90868a564dd26b52ba6595db28cb81c9f1',
'sha256sum': 'ac6166be1352e9e66a7574e0d6891c90868a564dd26b52ba6595db28cb81c9f1',
'size_bytes': 19716896,
},
],
},
@ -584,10 +584,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999133165001,
'object_name': 'c00f750c47d30f50f9ba809229f572f88f2906826b1039b271258eb7db3d5ecf',
'sha256sum': 'c00f750c47d30f50f9ba809229f572f88f2906826b1039b271258eb7db3d5ecf',
'size_bytes': 18414140,
'generation': 1738186807601616,
'object_name': '963550f05d3325262f6a601ee5ff82a1c84da639b11d5dea6d9f3ac5fbf299f7',
'sha256sum': '963550f05d3325262f6a601ee5ff82a1c84da639b11d5dea6d9f3ac5fbf299f7',
'size_bytes': 18408964,
},
],
},
@ -597,10 +597,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999133938009,
'object_name': 'ae4c94a1573db4c7e53b793ca8514c4091cf508311a1507c84a9a95aab9d330d',
'sha256sum': 'ae4c94a1573db4c7e53b793ca8514c4091cf508311a1507c84a9a95aab9d330d',
'size_bytes': 18377672,
'generation': 1738186801749657,
'object_name': '6b89f9afce71ceb0ba5e6430996abbda73092dc0fb8cc4e9167e298f89a8b725',
'sha256sum': '6b89f9afce71ceb0ba5e6430996abbda73092dc0fb8cc4e9167e298f89a8b725',
'size_bytes': 18375680,
},
],
},
@ -610,10 +610,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999139277132,
'object_name': '2e9ca7131acd07abb46567e47aa373b75d3efcabe9a600b9f7f0e9bc0c1a052e',
'sha256sum': '2e9ca7131acd07abb46567e47aa373b75d3efcabe9a600b9f7f0e9bc0c1a052e',
'size_bytes': 19767464,
'generation': 1738186808868372,
'object_name': 'b62fcf15801fee0ae59e69ab515aaf4941e855d5ce342a002a7ac75185c293d7',
'sha256sum': 'b62fcf15801fee0ae59e69ab515aaf4941e855d5ce342a002a7ac75185c293d7',
'size_bytes': 19769972,
},
],
},
@ -623,10 +623,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999137283464,
'object_name': '39c4eae5c0a739cfc0db8618c107426cb68dd74c2f98738ef734bdb3e4c624ca',
'sha256sum': '39c4eae5c0a739cfc0db8618c107426cb68dd74c2f98738ef734bdb3e4c624ca',
'size_bytes': 19039448,
'generation': 1738186802302544,
'object_name': '2b5e7783121b184b5847ee9ab24da09763b593d312ef91a619f12f03569dad02',
'sha256sum': '2b5e7783121b184b5847ee9ab24da09763b593d312ef91a619f12f03569dad02',
'size_bytes': 19040956,
},
],
},
@ -636,10 +636,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999130543287,
'object_name': 'efd4ae81a12b73fbeb0be75d51a666f9721391f2497ad3eddd333f97094e8ddd',
'sha256sum': 'efd4ae81a12b73fbeb0be75d51a666f9721391f2497ad3eddd333f97094e8ddd',
'size_bytes': 18936208,
'generation': 1738186809356214,
'object_name': 'e83949b9242fb00d38a93c3c4b043e473135a1a8f99aa53af3642cbc4edb86ab',
'sha256sum': 'e83949b9242fb00d38a93c3c4b043e473135a1a8f99aa53af3642cbc4edb86ab',
'size_bytes': 18936452,
},
],
},
@ -649,10 +649,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999140458314,
'object_name': '03eca099a260fd6233807df823436e6fcd184a5472b9d832397a693c8de4101e',
'sha256sum': '03eca099a260fd6233807df823436e6fcd184a5472b9d832397a693c8de4101e',
'size_bytes': 18581076,
'generation': 1738186808800578,
'object_name': '52044855dbbb7056a5ff2a51c88faca856278ca3ebf1c5c088704cf633d7e39c',
'sha256sum': '52044855dbbb7056a5ff2a51c88faca856278ca3ebf1c5c088704cf633d7e39c',
'size_bytes': 18586988,
},
],
},

56
build/DEPS

@ -7,10 +7,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999137081655,
'object_name': '288167cb6072e53141241227e60bc7024ff4eccb3dabf53633a20ce4f5c8217e',
'sha256sum': '288167cb6072e53141241227e60bc7024ff4eccb3dabf53633a20ce4f5c8217e',
'size_bytes': 19724468,
'generation': 1738186811481804,
'object_name': 'ac6166be1352e9e66a7574e0d6891c90868a564dd26b52ba6595db28cb81c9f1',
'sha256sum': 'ac6166be1352e9e66a7574e0d6891c90868a564dd26b52ba6595db28cb81c9f1',
'size_bytes': 19716896,
},
],
},
@ -20,10 +20,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999133165001,
'object_name': 'c00f750c47d30f50f9ba809229f572f88f2906826b1039b271258eb7db3d5ecf',
'sha256sum': 'c00f750c47d30f50f9ba809229f572f88f2906826b1039b271258eb7db3d5ecf',
'size_bytes': 18414140,
'generation': 1738186807601616,
'object_name': '963550f05d3325262f6a601ee5ff82a1c84da639b11d5dea6d9f3ac5fbf299f7',
'sha256sum': '963550f05d3325262f6a601ee5ff82a1c84da639b11d5dea6d9f3ac5fbf299f7',
'size_bytes': 18408964,
},
],
},
@ -33,10 +33,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999133938009,
'object_name': 'ae4c94a1573db4c7e53b793ca8514c4091cf508311a1507c84a9a95aab9d330d',
'sha256sum': 'ae4c94a1573db4c7e53b793ca8514c4091cf508311a1507c84a9a95aab9d330d',
'size_bytes': 18377672,
'generation': 1738186801749657,
'object_name': '6b89f9afce71ceb0ba5e6430996abbda73092dc0fb8cc4e9167e298f89a8b725',
'sha256sum': '6b89f9afce71ceb0ba5e6430996abbda73092dc0fb8cc4e9167e298f89a8b725',
'size_bytes': 18375680,
},
],
},
@ -46,10 +46,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999139277132,
'object_name': '2e9ca7131acd07abb46567e47aa373b75d3efcabe9a600b9f7f0e9bc0c1a052e',
'sha256sum': '2e9ca7131acd07abb46567e47aa373b75d3efcabe9a600b9f7f0e9bc0c1a052e',
'size_bytes': 19767464,
'generation': 1738186808868372,
'object_name': 'b62fcf15801fee0ae59e69ab515aaf4941e855d5ce342a002a7ac75185c293d7',
'sha256sum': 'b62fcf15801fee0ae59e69ab515aaf4941e855d5ce342a002a7ac75185c293d7',
'size_bytes': 19769972,
},
],
},
@ -59,10 +59,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999137283464,
'object_name': '39c4eae5c0a739cfc0db8618c107426cb68dd74c2f98738ef734bdb3e4c624ca',
'sha256sum': '39c4eae5c0a739cfc0db8618c107426cb68dd74c2f98738ef734bdb3e4c624ca',
'size_bytes': 19039448,
'generation': 1738186802302544,
'object_name': '2b5e7783121b184b5847ee9ab24da09763b593d312ef91a619f12f03569dad02',
'sha256sum': '2b5e7783121b184b5847ee9ab24da09763b593d312ef91a619f12f03569dad02',
'size_bytes': 19040956,
},
],
},
@ -72,10 +72,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999130543287,
'object_name': 'efd4ae81a12b73fbeb0be75d51a666f9721391f2497ad3eddd333f97094e8ddd',
'sha256sum': 'efd4ae81a12b73fbeb0be75d51a666f9721391f2497ad3eddd333f97094e8ddd',
'size_bytes': 18936208,
'generation': 1738186809356214,
'object_name': 'e83949b9242fb00d38a93c3c4b043e473135a1a8f99aa53af3642cbc4edb86ab',
'sha256sum': 'e83949b9242fb00d38a93c3c4b043e473135a1a8f99aa53af3642cbc4edb86ab',
'size_bytes': 18936452,
},
],
},
@ -85,10 +85,10 @@ deps = {
'dep_type': 'gcs',
'objects': [
{
'generation': 1737999140458314,
'object_name': '03eca099a260fd6233807df823436e6fcd184a5472b9d832397a693c8de4101e',
'sha256sum': '03eca099a260fd6233807df823436e6fcd184a5472b9d832397a693c8de4101e',
'size_bytes': 18581076,
'generation': 1738186808800578,
'object_name': '52044855dbbb7056a5ff2a51c88faca856278ca3ebf1c5c088704cf633d7e39c',
'sha256sum': '52044855dbbb7056a5ff2a51c88faca856278ca3ebf1c5c088704cf633d7e39c',
'size_bytes': 18586988,
},
],
},

1280
build/linux/sysroot_scripts/generated_package_lists/bullseye.amd64

File diff suppressed because it is too large Load Diff

1278
build/linux/sysroot_scripts/generated_package_lists/bullseye.arm64

File diff suppressed because it is too large Load Diff

1268
build/linux/sysroot_scripts/generated_package_lists/bullseye.armhf

File diff suppressed because it is too large Load Diff

1274
build/linux/sysroot_scripts/generated_package_lists/bullseye.i386

File diff suppressed because it is too large Load Diff

1262
build/linux/sysroot_scripts/generated_package_lists/bullseye.mips64el

File diff suppressed because it is too large Load Diff

1262
build/linux/sysroot_scripts/generated_package_lists/bullseye.mipsel

File diff suppressed because it is too large Load Diff

1274
build/linux/sysroot_scripts/generated_package_lists/bullseye.ppc64el

File diff suppressed because it is too large Load Diff

2
build/linux/sysroot_scripts/sysroot.gni

@ -5,4 +5,4 @@
# This file was generated by
# build/linux/sysroot_scripts/build_and_upload.py
cr_sysroot_key = "20250122T204604Z-1"
cr_sysroot_key = "20250129T203412Z-1"

3
build/linux/sysroot_scripts/sysroot_creator.py

@ -36,7 +36,7 @@ BUILD_DIR = os.path.join(CHROME_DIR, "out", "sysroot-build", RELEASE)
# gpg keyring file generated using generate_keyring.sh
KEYRING_FILE = os.path.join(SCRIPT_DIR, "keyring.gpg")
ARCHIVE_TIMESTAMP = "20250122T204604Z"
ARCHIVE_TIMESTAMP = "20250129T203412Z"
ARCHIVE_URL = f"https://snapshot.debian.org/archive/debian/{ARCHIVE_TIMESTAMP}/"
APT_SOURCES_LIST = [
@ -705,7 +705,6 @@ def upload_sysroot(arch: str) -> str:
f"{DISTRO}_{RELEASE}_{arch}_sysroot.tar.xz")
command = [
"upload_to_google_storage_first_class.py",
"--force",
"--bucket",
"chrome-linux-sysroot",
tarball_path,

14
build/linux/sysroot_scripts/sysroots.json

@ -1,42 +1,42 @@
{
"bullseye_amd64": {
"Sha256Sum": "288167cb6072e53141241227e60bc7024ff4eccb3dabf53633a20ce4f5c8217e",
"Sha256Sum": "ac6166be1352e9e66a7574e0d6891c90868a564dd26b52ba6595db28cb81c9f1",
"SysrootDir": "debian_bullseye_amd64-sysroot",
"Tarball": "debian_bullseye_amd64_sysroot.tar.xz",
"URL": "https://commondatastorage.googleapis.com/chrome-linux-sysroot"
},
"bullseye_arm64": {
"Sha256Sum": "c00f750c47d30f50f9ba809229f572f88f2906826b1039b271258eb7db3d5ecf",
"Sha256Sum": "963550f05d3325262f6a601ee5ff82a1c84da639b11d5dea6d9f3ac5fbf299f7",
"SysrootDir": "debian_bullseye_arm64-sysroot",
"Tarball": "debian_bullseye_arm64_sysroot.tar.xz",
"URL": "https://commondatastorage.googleapis.com/chrome-linux-sysroot"
},
"bullseye_armhf": {
"Sha256Sum": "ae4c94a1573db4c7e53b793ca8514c4091cf508311a1507c84a9a95aab9d330d",
"Sha256Sum": "6b89f9afce71ceb0ba5e6430996abbda73092dc0fb8cc4e9167e298f89a8b725",
"SysrootDir": "debian_bullseye_armhf-sysroot",
"Tarball": "debian_bullseye_armhf_sysroot.tar.xz",
"URL": "https://commondatastorage.googleapis.com/chrome-linux-sysroot"
},
"bullseye_i386": {
"Sha256Sum": "2e9ca7131acd07abb46567e47aa373b75d3efcabe9a600b9f7f0e9bc0c1a052e",
"Sha256Sum": "b62fcf15801fee0ae59e69ab515aaf4941e855d5ce342a002a7ac75185c293d7",
"SysrootDir": "debian_bullseye_i386-sysroot",
"Tarball": "debian_bullseye_i386_sysroot.tar.xz",
"URL": "https://commondatastorage.googleapis.com/chrome-linux-sysroot"
},
"bullseye_mips64el": {
"Sha256Sum": "39c4eae5c0a739cfc0db8618c107426cb68dd74c2f98738ef734bdb3e4c624ca",
"Sha256Sum": "2b5e7783121b184b5847ee9ab24da09763b593d312ef91a619f12f03569dad02",
"SysrootDir": "debian_bullseye_mips64el-sysroot",
"Tarball": "debian_bullseye_mips64el_sysroot.tar.xz",
"URL": "https://commondatastorage.googleapis.com/chrome-linux-sysroot"
},
"bullseye_mipsel": {
"Sha256Sum": "efd4ae81a12b73fbeb0be75d51a666f9721391f2497ad3eddd333f97094e8ddd",
"Sha256Sum": "e83949b9242fb00d38a93c3c4b043e473135a1a8f99aa53af3642cbc4edb86ab",
"SysrootDir": "debian_bullseye_mipsel-sysroot",
"Tarball": "debian_bullseye_mipsel_sysroot.tar.xz",
"URL": "https://commondatastorage.googleapis.com/chrome-linux-sysroot"
},
"bullseye_ppc64el": {
"Sha256Sum": "03eca099a260fd6233807df823436e6fcd184a5472b9d832397a693c8de4101e",
"Sha256Sum": "52044855dbbb7056a5ff2a51c88faca856278ca3ebf1c5c088704cf633d7e39c",
"SysrootDir": "debian_bullseye_ppc64el-sysroot",
"Tarball": "debian_bullseye_ppc64el_sysroot.tar.xz",
"URL": "https://commondatastorage.googleapis.com/chrome-linux-sysroot"