From 7d3718ce4d32e2c7c8e3336afe0fc52f012446d5 Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Wed, 6 Sep 2023 09:22:38 -0700 Subject: [PATCH] Roll Fuchsia with license script fix --- DEPS | 2 +- ci/licenses_golden/excluded_files | 2 ++ ci/licenses_golden/licenses_fuchsia | 22 +++++++++++++++++++++- ci/licenses_golden/tool_signature | 2 +- tools/licenses/lib/paths.dart | 1 + 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index 0affe4f219596..e8ab3f423dc3a 100644 --- a/DEPS +++ b/DEPS @@ -924,7 +924,7 @@ deps = { 'packages': [ { 'package': 'fuchsia/sdk/core/linux-amd64', - 'version': 'z9uQ0mXwjKFQF05XlBv-X8Em1QvkefyGcIJWrSZEm-sC' + 'version': '8dgICHnG28wNHzoz33qFF_nQu52I3PVTfNbXzV6PWTQC' } ], 'condition': 'host_os == "linux" and not download_fuchsia_sdk', diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index 6313f5fba1325..dd7a5cb1cbf97 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -624,6 +624,8 @@ ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.softmac/meta.json ../../../fuchsia/sdk/linux/fidl/zx/meta.json ../../../fuchsia/sdk/linux/meta +../../../fuchsia/sdk/linux/packages/blobs +../../../fuchsia/sdk/linux/packages/realm_builder_server/meta.json ../../../fuchsia/sdk/linux/pkg/async-cpp/meta.json ../../../fuchsia/sdk/linux/pkg/async-default/meta.json ../../../fuchsia/sdk/linux/pkg/async-loop-cpp/meta.json diff --git a/ci/licenses_golden/licenses_fuchsia b/ci/licenses_golden/licenses_fuchsia index b8d60381fc554..fbffcba766086 100644 --- a/ci/licenses_golden/licenses_fuchsia +++ b/ci/licenses_golden/licenses_fuchsia @@ -1,4 +1,4 @@ -Signature: 9a31319fc49dcb0a9eed7caba8bc94aa +Signature: ba6463628187613a22cdde62a73696f0 ==================================================================================================== LIBRARY: fuchsia_sdk @@ -536,6 +536,12 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libpthread.so FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/librt.so FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libzircon.so FILE: ../../../fuchsia/sdk/linux/data/config/symbol_index/config.json +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64/release/content_checklist_path +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64/release/package_manifest.json +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64/release/content_checklist_path +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64/release/package_manifest.json +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64/release/content_checklist_path +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64/release/package_manifest.json FILE: ../../../fuchsia/sdk/linux/pkg/async-default/async-default.ifs FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_shared_lib/driver_runtime.ifs FILE: ../../../fuchsia/sdk/linux/pkg/fdio/fdio.ifs @@ -2340,6 +2346,12 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libpthread.so FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/librt.so FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libzircon.so FILE: ../../../fuchsia/sdk/linux/data/config/symbol_index/config.json +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64/release/content_checklist_path +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64/release/package_manifest.json +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64/release/content_checklist_path +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64/release/package_manifest.json +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64/release/content_checklist_path +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64/release/package_manifest.json FILE: ../../../fuchsia/sdk/linux/pkg/async-default/async-default.ifs FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_shared_lib/driver_runtime.ifs FILE: ../../../fuchsia/sdk/linux/pkg/fdio/fdio.ifs @@ -4242,6 +4254,7 @@ ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/clock.fidl + ../. ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/common.fidl + ../../../fuchsia/sdk/linux/LICENSE ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/composite.fidl + ../../../fuchsia/sdk/linux/LICENSE ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/composite_connector.fidl + ../../../fuchsia/sdk/linux/LICENSE +ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/device_type.fidl + ../../../fuchsia/sdk/linux/LICENSE ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/plug.fidl + ../../../fuchsia/sdk/linux/LICENSE ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer_format.fidl + ../../../fuchsia/sdk/linux/LICENSE ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/history.fidl + ../../../fuchsia/sdk/linux/LICENSE @@ -4299,6 +4312,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/clock.fidl FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/common.fidl FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/composite.fidl FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/composite_connector.fidl +FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/device_type.fidl FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/plug.fidl FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer_format.fidl FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/history.fidl @@ -4908,6 +4922,12 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libpthread.so FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/librt.so FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libzircon.so FILE: ../../../fuchsia/sdk/linux/data/config/symbol_index/config.json +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64/release/content_checklist_path +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64/release/package_manifest.json +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64/release/content_checklist_path +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64/release/package_manifest.json +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64/release/content_checklist_path +FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64/release/package_manifest.json FILE: ../../../fuchsia/sdk/linux/pkg/async-default/async-default.ifs FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_shared_lib/driver_runtime.ifs FILE: ../../../fuchsia/sdk/linux/pkg/fdio/fdio.ifs diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index c6a8bbffb78fd..bb1142c385e9a 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 996bda987bb421e5aecf9238c247c296 +Signature: 575f2a41ff152394b7e539742fa248e6 diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart index ca5b8f6689030..4118cecee57eb 100644 --- a/tools/licenses/lib/paths.dart +++ b/tools/licenses/lib/paths.dart @@ -38,6 +38,7 @@ final Set skippedPaths = { r'fuchsia/sdk/linux/docs', r'fuchsia/sdk/linux/meta', r'fuchsia/sdk/linux/NOTICE.fuchsia', // covers things that contribute to the Fuchsia SDK; see fxb/94240 + r'fuchsia/sdk/linux/packages/blobs', // See https://github.com/flutter/flutter/issues/134042. r'fuchsia/sdk/linux/tools', r'fuchsia/sdk/mac/docs', r'fuchsia/sdk/mac/meta',