[bazel] Move third party patch files into patches subdirectories

This matches the convention of other third party packages with patches. Signed-off-by: James Wainwright <[email protected]>
lowRISC · Dec 19, 2024 · bee8bc1 · bee8bc1
1 parent f4a7805
commit bee8bc1
Show file tree

Hide file tree

Showing 35 changed files with 68 additions and 41 deletions.
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/third_party/coremark/extensions.bzl b/third_party/coremark/extensions.bzl
@@ -18,8 +18,8 @@ def _coremark_repos():
             "https://github.com/eembc/coremark/archive/eefc986ebd3452d6adde22eafaff3e5c859f29e4.tar.gz",
         ],
         patches = [
-            Label("//third_party/coremark:use_ottf_main.patch"),
-            Label("//third_party/coremark:print_coremark_per_mhz.patch"),
+            Label("//third_party/coremark/patches:use_ottf_main.patch"),
+            Label("//third_party/coremark/patches:print_coremark_per_mhz.patch"),
         ],
         patch_args = ["-p1"],
     )
diff --git a/third_party/coremark/patches/BUILD b/third_party/coremark/patches/BUILD
@@ -0,0 +1,3 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/...rty/coremark/print_coremark_per_mhz.patch → ...mark/patches/print_coremark_per_mhz.patch b/...rty/coremark/print_coremark_per_mhz.patch → ...mark/patches/print_coremark_per_mhz.patch
diff --git a/third_party/coremark/use_ottf_main.patch → ...arty/coremark/patches/use_ottf_main.patch b/third_party/coremark/use_ottf_main.patch → ...arty/coremark/patches/use_ottf_main.patch
diff --git a/third_party/freertos/extensions.bzl b/third_party/freertos/extensions.bzl
@@ -18,9 +18,9 @@ def _freertos_repos():
             "https://github.com/FreeRTOS/FreeRTOS-Kernel/archive/0b1e9d79c82c1bf00e93142f9d5b1b7b62446995.tar.gz",
         ],
         patches = [
-            Label("//third_party/freertos:0001-Remove-mtime-address-macros.patch"),
-            Label("//third_party/freertos:0002-Remove-references-to-stdlib.h.patch"),
-            Label("//third_party/freertos:0003-Replace-string.h-with-references-to-OT-memory.h.patch"),
+            Label("//third_party/freertos/patches:0001-Remove-mtime-address-macros.patch"),
+            Label("//third_party/freertos/patches:0002-Remove-references-to-stdlib.h.patch"),
+            Label("//third_party/freertos/patches:0003-Replace-string.h-with-references-to-OT-memory.h.patch"),
         ],
         patch_args = ["-p1"],
     )
diff --git a/...os/0001-Remove-mtime-address-macros.patch → ...es/0001-Remove-mtime-address-macros.patch b/...os/0001-Remove-mtime-address-macros.patch → ...es/0001-Remove-mtime-address-macros.patch
diff --git a/.../0002-Remove-references-to-stdlib.h.patch → .../0002-Remove-references-to-stdlib.h.patch b/.../0002-Remove-references-to-stdlib.h.patch → .../0002-Remove-references-to-stdlib.h.patch
diff --git a/...ng.h-with-references-to-OT-memory.h.patch → ...ng.h-with-references-to-OT-memory.h.patch b/...ng.h-with-references-to-OT-memory.h.patch → ...ng.h-with-references-to-OT-memory.h.patch
diff --git a/third_party/freertos/patches/BUILD b/third_party/freertos/patches/BUILD
@@ -0,0 +1,3 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/third_party/hsm/extensions.bzl b/third_party/hsm/extensions.bzl
@@ -16,7 +16,7 @@ def _hsm_repos():
         strip_prefix = "SoftHSMv2-4975c0df4c7090e97a3860ae21079a9597cfedc6",
         sha256 = "72cf979ec4f74ca4555861dcae45cf7d1b667cc2e4f3ee3fb26e6ff1b99aec95",
         patches = [
-            Label("//third_party/hsm:0001-Disable-filename-logging.patch"),
+            Label("//third_party/hsm/patches:0001-Disable-filename-logging.patch"),
         ],
         patch_args = ["-p1"],
     )

diff --git a/...y/hsm/0001-Disable-filename-logging.patch → ...tches/0001-Disable-filename-logging.patch b/...y/hsm/0001-Disable-filename-logging.patch → ...tches/0001-Disable-filename-logging.patch
diff --git a/third_party/hsm/patches/BUILD b/third_party/hsm/patches/BUILD
@@ -0,0 +1,3 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/third_party/llvm_compiler_rt/extensions.bzl b/third_party/llvm_compiler_rt/extensions.bzl
@@ -18,8 +18,8 @@ def _llvm_compiler_rt_repos():
             "https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/compiler-rt-16.0.2.src.tar.xz",
         ],
         patches = [
-            Label("//third_party/llvm_compiler_rt:0001-Headers.patch"),
-            Label("//third_party/llvm_compiler_rt:0002-invalid-data.patch"),
+            Label("//third_party/llvm_compiler_rt/patches:0001-Headers.patch"),
+            Label("//third_party/llvm_compiler_rt/patches:0002-invalid-data.patch"),
         ],
         patch_args = ["-p1"],
     )
diff --git a/...party/llvm_compiler_rt/0001-Headers.patch → ...vm_compiler_rt/patches/0001-Headers.patch b/...party/llvm_compiler_rt/0001-Headers.patch → ...vm_compiler_rt/patches/0001-Headers.patch
diff --git a/.../llvm_compiler_rt/0002-invalid-data.patch → ...mpiler_rt/patches/0002-invalid-data.patch b/.../llvm_compiler_rt/0002-invalid-data.patch → ...mpiler_rt/patches/0002-invalid-data.patch
diff --git a/third_party/llvm_compiler_rt/patches/BUILD b/third_party/llvm_compiler_rt/patches/BUILD
@@ -0,0 +1,3 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/third_party/open-dice/extensions.bzl b/third_party/open-dice/extensions.bzl
@@ -16,7 +16,7 @@ def _open_dice_repos():
         urls = ["https://github.com/google/open-dice/archive/cf3f4cc7a3506a33ee3a437544ef6f40056b3563.zip"],
         sha256 = "d7ce830111451afe2a255cac3b750f82e50efe2aaf6bac0b076881c964cfe78d",
         patches = [
-            Label("//third_party/open-dice:Add-a-local-strlen-implementation.patch"),
+            Label("//third_party/open-dice/patches:Add-a-local-strlen-implementation.patch"),
         ],
         patch_args = ["-p1"],
     )
diff --git a/...e/Add-a-local-strlen-implementation.patch → ...s/Add-a-local-strlen-implementation.patch b/...e/Add-a-local-strlen-implementation.patch → ...s/Add-a-local-strlen-implementation.patch
diff --git a/third_party/open-dice/patches/BUILD b/third_party/open-dice/patches/BUILD
@@ -0,0 +1,3 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/third_party/openocd/extensions.bzl b/third_party/openocd/extensions.bzl
@@ -23,9 +23,9 @@ def _openocd_repos():
         sha256 = "af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa",
         # See Issue(#18087)
         patches = [
-            Label("@lowrisc_opentitan//third_party/openocd:calloc_transpose.patch"),
-            Label("@lowrisc_opentitan//third_party/openocd:reset_on_dmi_op_error.patch"),
-            Label("@lowrisc_opentitan//third_party/openocd:string_truncate_build_error.patch"),
+            Label("@lowrisc_opentitan//third_party/openocd/patches:calloc_transpose.patch"),
+            Label("@lowrisc_opentitan//third_party/openocd/patches:reset_on_dmi_op_error.patch"),
+            Label("@lowrisc_opentitan//third_party/openocd/patches:string_truncate_build_error.patch"),
         ],
         patch_args = ["-p1"],
     )
diff --git a/third_party/openocd/patches/BUILD b/third_party/openocd/patches/BUILD
@@ -0,0 +1,3 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/third_party/openocd/calloc_transpose.patch → ...ty/openocd/patches/calloc_transpose.patch b/third_party/openocd/calloc_transpose.patch → ...ty/openocd/patches/calloc_transpose.patch
diff --git a/...party/openocd/reset_on_dmi_op_error.patch → ...enocd/patches/reset_on_dmi_op_error.patch b/...party/openocd/reset_on_dmi_op_error.patch → ...enocd/patches/reset_on_dmi_op_error.patch
diff --git a/...openocd/string_truncate_build_error.patch → ...patches/string_truncate_build_error.patch b/...openocd/string_truncate_build_error.patch → ...patches/string_truncate_build_error.patch
diff --git a/third_party/riscv-compliance/extensions.bzl b/third_party/riscv-compliance/extensions.bzl
@@ -18,7 +18,7 @@ def _riscv_compliance_repos():
             "https://github.com/riscv/riscv-compliance/archive/2636302c27557b42d99bed7e0537beffdf8e1ab4.tar.gz",
         ],
         patches = [
-            Label("//third_party/riscv-compliance:0001-Add-configurable-trap-alignment-and-entry-point-to-p.patch"),
+            Label("//third_party/riscv-compliance/patches:0001-Add-configurable-trap-alignment-and-entry-point-to-p.patch"),
         ],
         patch_args = ["-p1"],
     )
diff --git a/...trap-alignment-and-entry-point-to-p.patch → ...trap-alignment-and-entry-point-to-p.patch b/...trap-alignment-and-entry-point-to-p.patch → ...trap-alignment-and-entry-point-to-p.patch
diff --git a/third_party/riscv-compliance/patches/BUILD b/third_party/riscv-compliance/patches/BUILD
@@ -0,0 +1,3 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/third_party/sphincsplus/extensions.bzl b/third_party/sphincsplus/extensions.bzl
@@ -40,7 +40,7 @@ def _sphincsplus_repos(local = None):
         build_file = "@lowrisc_opentitan//third_party/sphincsplus:BUILD.sphincsplus.bazel",
         sha256 = "b301faa7a42ef538323a732929d49341b1cbd8375f643f7d98ca32cd6efacc32",
         patches = [
-            Label("@lowrisc_opentitan//third_party/sphincsplus:sphincsplus-namespace.patch"),
+            Label("@lowrisc_opentitan//third_party/sphincsplus/patches:sphincsplus-namespace.patch"),
         ],
         patch_args = ["-p2"],
     )
diff --git a/third_party/sphincsplus/patches/BUILD b/third_party/sphincsplus/patches/BUILD
@@ -0,0 +1,3 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/...y/sphincsplus/sphincsplus-namespace.patch → ...splus/patches/sphincsplus-namespace.patch b/...y/sphincsplus/sphincsplus-namespace.patch → ...splus/patches/sphincsplus-namespace.patch
diff --git a/third_party/xkcp/extensions.bzl b/third_party/xkcp/extensions.bzl
@@ -19,8 +19,8 @@ def _xkcp_repos():
             "https://github.com/XKCP/XKCP/archive/56ae09923153c3e801a6891eb19e4a3b5bb6f6e2.tar.gz",
         ],
         patches = [
-            Label("//third_party/xkcp:add_config_header.patch"),
-            Label("//third_party/xkcp:add_main_license.patch"),
+            Label("//third_party/xkcp/patches:add_config_header.patch"),
+            Label("//third_party/xkcp/patches:add_main_license.patch"),
         ],
         patch_args = ["-p1"],
     )
diff --git a/third_party/xkcp/patches/BUILD b/third_party/xkcp/patches/BUILD
@@ -0,0 +1,3 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/third_party/xkcp/add_config_header.patch → ...arty/xkcp/patches/add_config_header.patch b/third_party/xkcp/add_config_header.patch → ...arty/xkcp/patches/add_config_header.patch
diff --git a/third_party/xkcp/add_main_license.patch → ...party/xkcp/patches/add_main_license.patch b/third_party/xkcp/add_main_license.patch → ...party/xkcp/patches/add_main_license.patch