From 63a2ee5507bf1a9ac2c4c2f4e58411d4819dd282 Mon Sep 17 00:00:00 2001 From: Wyatt Hepler Date: Fri, 9 Sep 2022 21:03:22 +0000 Subject: [PATCH] third_party/fuchsia: Rename function.patch Rename function.patch to pigweed_adaptations.patch since it affects more than just the function sources. Change-Id: I06c845927928f2cf32866b3dff567f096b3f9910 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/109715 Pigweed-Auto-Submit: Wyatt Hepler Reviewed-by: Ted Pudlik Commit-Queue: Auto-Submit --- third_party/fuchsia/copy.bara.sky | 3 ++- third_party/fuchsia/generate_fuchsia_patch.py | 3 ++- .../fuchsia/{function.patch => pigweed_adaptations.patch} | 0 3 files changed, 4 insertions(+), 2 deletions(-) rename third_party/fuchsia/{function.patch => pigweed_adaptations.patch} (100%) diff --git a/third_party/fuchsia/copy.bara.sky b/third_party/fuchsia/copy.bara.sky index 0e4e051877..5d5414c95b 100644 --- a/third_party/fuchsia/copy.bara.sky +++ b/third_party/fuchsia/copy.bara.sky @@ -51,7 +51,8 @@ core.workflow( authoring = authoring.pass_thru("Fuchsia Authors "), transformations = [ core.move("", "third_party/fuchsia/repo"), - patch.apply(["function.patch"]), + # Apply the patch file created by generate_fuchsia_patch.py. + patch.apply(["pigweed_adaptations.patch"]), # Show all commits but exclude the author to reduce line length. metadata.squash_notes( "third_party/fuchsia: Copybara import of the fit library\n\n", diff --git a/third_party/fuchsia/generate_fuchsia_patch.py b/third_party/fuchsia/generate_fuchsia_patch.py index 05f6f11d35..adbe3beb29 100755 --- a/third_party/fuchsia/generate_fuchsia_patch.py +++ b/third_party/fuchsia/generate_fuchsia_patch.py @@ -144,7 +144,8 @@ def _main() -> None: Path('third_party/fuchsia/repo', path).as_posix().encode()) # Write the diff to function.patch. - with output_path.joinpath('function.patch').open('wb') as output: + with output_path.joinpath('pigweed_adaptations.patch').open( + 'wb') as output: output.write(HEADER) for line in diff.splitlines(keepends=True): diff --git a/third_party/fuchsia/function.patch b/third_party/fuchsia/pigweed_adaptations.patch similarity index 100% rename from third_party/fuchsia/function.patch rename to third_party/fuchsia/pigweed_adaptations.patch