Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Roll Fuchsia with license script fix #45498

Merged
merged 1 commit into from
Sep 6, 2023
Merged

Roll Fuchsia with license script fix #45498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 2 additions & 0 deletions ci/licenses_golden/excluded_files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 21 additions & 1 deletion ci/licenses_golden/licenses_fuchsia
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 9a31319fc49dcb0a9eed7caba8bc94aa
Signature: ba6463628187613a22cdde62a73696f0

====================================================================================================
LIBRARY: fuchsia_sdk
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Signature: 996bda987bb421e5aecf9238c247c296
Signature: 575f2a41ff152394b7e539742fa248e6

1 change: 1 addition & 0 deletions tools/licenses/lib/paths.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ final Set<String> skippedPaths = <String>{
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',
Expand Down