From bee8bc1a622f366b787ff2d2d144049f4bce8744 Mon Sep 17 00:00:00 2001 From: James Wainwright Date: Thu, 19 Dec 2024 15:34:34 +0000 Subject: [PATCH] [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 --- MODULE.bazel.lock | 50 +++++++++---------- third_party/coremark/extensions.bzl | 4 +- third_party/coremark/patches/BUILD | 3 ++ .../print_coremark_per_mhz.patch | 0 .../{ => patches}/use_ottf_main.patch | 0 third_party/freertos/extensions.bzl | 6 +-- .../0001-Remove-mtime-address-macros.patch | 0 .../0002-Remove-references-to-stdlib.h.patch | 0 ...ing.h-with-references-to-OT-memory.h.patch | 0 third_party/freertos/patches/BUILD | 3 ++ third_party/hsm/extensions.bzl | 2 +- .../0001-Disable-filename-logging.patch | 0 third_party/hsm/patches/BUILD | 3 ++ third_party/llvm_compiler_rt/extensions.bzl | 4 +- .../{ => patches}/0001-Headers.patch | 0 .../{ => patches}/0002-invalid-data.patch | 0 third_party/llvm_compiler_rt/patches/BUILD | 3 ++ third_party/open-dice/extensions.bzl | 2 +- .../Add-a-local-strlen-implementation.patch | 0 third_party/open-dice/patches/BUILD | 3 ++ third_party/openocd/extensions.bzl | 6 +-- third_party/openocd/patches/BUILD | 3 ++ .../{ => patches}/calloc_transpose.patch | 0 .../{ => patches}/reset_on_dmi_op_error.patch | 0 .../string_truncate_build_error.patch | 0 third_party/riscv-compliance/extensions.bzl | 2 +- ...-trap-alignment-and-entry-point-to-p.patch | 0 third_party/riscv-compliance/patches/BUILD | 3 ++ third_party/sphincsplus/extensions.bzl | 2 +- third_party/sphincsplus/patches/BUILD | 3 ++ .../{ => patches}/sphincsplus-namespace.patch | 0 third_party/xkcp/extensions.bzl | 4 +- third_party/xkcp/patches/BUILD | 3 ++ .../{ => patches}/add_config_header.patch | 0 .../xkcp/{ => patches}/add_main_license.patch | 0 35 files changed, 68 insertions(+), 41 deletions(-) create mode 100644 third_party/coremark/patches/BUILD rename third_party/coremark/{ => patches}/print_coremark_per_mhz.patch (100%) rename third_party/coremark/{ => patches}/use_ottf_main.patch (100%) rename third_party/freertos/{ => patches}/0001-Remove-mtime-address-macros.patch (100%) rename third_party/freertos/{ => patches}/0002-Remove-references-to-stdlib.h.patch (100%) rename third_party/freertos/{ => patches}/0003-Replace-string.h-with-references-to-OT-memory.h.patch (100%) create mode 100644 third_party/freertos/patches/BUILD rename third_party/hsm/{ => patches}/0001-Disable-filename-logging.patch (100%) create mode 100644 third_party/hsm/patches/BUILD rename third_party/llvm_compiler_rt/{ => patches}/0001-Headers.patch (100%) rename third_party/llvm_compiler_rt/{ => patches}/0002-invalid-data.patch (100%) create mode 100644 third_party/llvm_compiler_rt/patches/BUILD rename third_party/open-dice/{ => patches}/Add-a-local-strlen-implementation.patch (100%) create mode 100644 third_party/open-dice/patches/BUILD create mode 100644 third_party/openocd/patches/BUILD rename third_party/openocd/{ => patches}/calloc_transpose.patch (100%) rename third_party/openocd/{ => patches}/reset_on_dmi_op_error.patch (100%) rename third_party/openocd/{ => patches}/string_truncate_build_error.patch (100%) rename third_party/riscv-compliance/{ => patches}/0001-Add-configurable-trap-alignment-and-entry-point-to-p.patch (100%) create mode 100644 third_party/riscv-compliance/patches/BUILD create mode 100644 third_party/sphincsplus/patches/BUILD rename third_party/sphincsplus/{ => patches}/sphincsplus-namespace.patch (100%) create mode 100644 third_party/xkcp/patches/BUILD rename third_party/xkcp/{ => patches}/add_config_header.patch (100%) rename third_party/xkcp/{ => patches}/add_main_license.patch (100%) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 22a629878e26e7..12bc03bfe44732 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -175,7 +175,7 @@ "moduleExtensions": { "//third_party/coremark:extensions.bzl%coremark": { "general": { - "bzlTransitiveDigest": "oYo82g1v5+HVld/0IwdJ9ySQQ8T3TvFE4GeVWBErLKM=", + "bzlTransitiveDigest": "InK9o+8/hN6CwtLICnnFEg5vFlwmr2K0KmjQb+BFBkM=", "usagesDigest": "2Rw2u4BdMyaIwI4YT4ljG3LsOQ4DRpLCsRYOyCC9ZfQ=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -192,8 +192,8 @@ "https://github.com/eembc/coremark/archive/eefc986ebd3452d6adde22eafaff3e5c859f29e4.tar.gz" ], "patches": [ - "@@//third_party/coremark:use_ottf_main.patch", - "@@//third_party/coremark:print_coremark_per_mhz.patch" + "@@//third_party/coremark/patches:use_ottf_main.patch", + "@@//third_party/coremark/patches:print_coremark_per_mhz.patch" ], "patch_args": [ "-p1" @@ -212,7 +212,7 @@ }, "//third_party/freertos:extensions.bzl%freertos": { "general": { - "bzlTransitiveDigest": "/FQJ+BTUkI8KVA6zH5bf9ISh+S5NtLe59qvFJ92eEYc=", + "bzlTransitiveDigest": "HXsre/mTrMiwKGsqg3aOscUQ2f8cFVXFlj6HV8OCHKE=", "usagesDigest": "LLGF1pNB1qTW2QYCRp1VH3TJcvhB6wtmdwscSSXF8YQ=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -229,9 +229,9 @@ "https://github.com/FreeRTOS/FreeRTOS-Kernel/archive/0b1e9d79c82c1bf00e93142f9d5b1b7b62446995.tar.gz" ], "patches": [ - "@@//third_party/freertos:0001-Remove-mtime-address-macros.patch", - "@@//third_party/freertos:0002-Remove-references-to-stdlib.h.patch", - "@@//third_party/freertos:0003-Replace-string.h-with-references-to-OT-memory.h.patch" + "@@//third_party/freertos/patches:0001-Remove-mtime-address-macros.patch", + "@@//third_party/freertos/patches:0002-Remove-references-to-stdlib.h.patch", + "@@//third_party/freertos/patches:0003-Replace-string.h-with-references-to-OT-memory.h.patch" ], "patch_args": [ "-p1" @@ -278,7 +278,7 @@ }, "//third_party/hsm:extensions.bzl%hsm": { "general": { - "bzlTransitiveDigest": "N0Ig5Wjtbydk+0T+3/AbZ1OZwIU2gSl7/vCkLVDUhck=", + "bzlTransitiveDigest": "elvgjJ3IE36hPk3TsvnK1wIHpXfE98mq6jgt8atV+Jo=", "usagesDigest": "mu3b1NhkSkrsBm0cZ6CBA9ZVEvuZ6YymSKRyvB8ZrG0=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -303,7 +303,7 @@ "strip_prefix": "SoftHSMv2-4975c0df4c7090e97a3860ae21079a9597cfedc6", "sha256": "72cf979ec4f74ca4555861dcae45cf7d1b667cc2e4f3ee3fb26e6ff1b99aec95", "patches": [ - "@@//third_party/hsm:0001-Disable-filename-logging.patch" + "@@//third_party/hsm/patches:0001-Disable-filename-logging.patch" ], "patch_args": [ "-p1" @@ -361,7 +361,7 @@ }, "//third_party/llvm_compiler_rt:extensions.bzl%llvm_compiler_rt": { "general": { - "bzlTransitiveDigest": "9by7wGNqZ6xTeVHbEPrcTWDSPfJ9nySxFHb5oN+PilM=", + "bzlTransitiveDigest": "fjl5zQ4kB7DmikP9ty9kgUykJKxg0y1gbKbrNP5fUGU=", "usagesDigest": "zPU6Y/UeGIc1XYL+S8s9utiQWrKdW0oDmXUJf+QpxLQ=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -378,8 +378,8 @@ "https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/compiler-rt-16.0.2.src.tar.xz" ], "patches": [ - "@@//third_party/llvm_compiler_rt:0001-Headers.patch", - "@@//third_party/llvm_compiler_rt:0002-invalid-data.patch" + "@@//third_party/llvm_compiler_rt/patches:0001-Headers.patch", + "@@//third_party/llvm_compiler_rt/patches:0002-invalid-data.patch" ], "patch_args": [ "-p1" @@ -578,7 +578,7 @@ }, "//third_party/open-dice:extensions.bzl%open_dice": { "general": { - "bzlTransitiveDigest": "CFBwD8rTE8Hk/R2huNOcNoh+1tuu3eRvYQ6N/QK5aHk=", + "bzlTransitiveDigest": "aWKdq1LJjyKY+Q2GJVzvgetfzDu1KODKYV2E2QYHwwU=", "usagesDigest": "JS7GxioQYipTmuvH3Q9liClSKpuPbE8hW9EyTeNJMo8=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -595,7 +595,7 @@ ], "sha256": "d7ce830111451afe2a255cac3b750f82e50efe2aaf6bac0b076881c964cfe78d", "patches": [ - "@@//third_party/open-dice:Add-a-local-strlen-implementation.patch" + "@@//third_party/open-dice/patches:Add-a-local-strlen-implementation.patch" ], "patch_args": [ "-p1" @@ -614,7 +614,7 @@ }, "//third_party/openocd:extensions.bzl%openocd": { "general": { - "bzlTransitiveDigest": "NeYzoVT+Zo4QwYxMzTAHqWUf18wgxqc2KzJTiMAGMo4=", + "bzlTransitiveDigest": "BV+++QVUqWJRUI8a6DAYdeNHXI1RQ17YnYlzoZVTwAU=", "usagesDigest": "HAzjsaERYt5w/T83F2veXDcpIVvq1S4fiAac6SBUTlM=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -632,9 +632,9 @@ "build_file": "@@//third_party/openocd:BUILD.openocd.bazel", "sha256": "af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa", "patches": [ - "@@//third_party/openocd:calloc_transpose.patch", - "@@//third_party/openocd:reset_on_dmi_op_error.patch", - "@@//third_party/openocd:string_truncate_build_error.patch" + "@@//third_party/openocd/patches:calloc_transpose.patch", + "@@//third_party/openocd/patches:reset_on_dmi_op_error.patch", + "@@//third_party/openocd/patches:string_truncate_build_error.patch" ], "patch_args": [ "-p1" @@ -658,7 +658,7 @@ }, "//third_party/riscv-compliance:extensions.bzl%riscv_compliance": { "general": { - "bzlTransitiveDigest": "yy13CaTTAIrDakPXT4CFPd6k3fhD8hs/HK/1/HZDyYM=", + "bzlTransitiveDigest": "WTz1gDYhq81OZSrzxCIg9Wsoexw13Tg4dpoP1azL8oM=", "usagesDigest": "X4fjnmL/qLY3Umq+OyBElFJjNuEhyxpVugPcBohIft0=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -675,7 +675,7 @@ "https://github.com/riscv/riscv-compliance/archive/2636302c27557b42d99bed7e0537beffdf8e1ab4.tar.gz" ], "patches": [ - "@@//third_party/riscv-compliance:0001-Add-configurable-trap-alignment-and-entry-point-to-p.patch" + "@@//third_party/riscv-compliance/patches:0001-Add-configurable-trap-alignment-and-entry-point-to-p.patch" ], "patch_args": [ "-p1" @@ -749,7 +749,7 @@ }, "//third_party/sphincsplus:extensions.bzl%sphincsplus": { "general": { - "bzlTransitiveDigest": "De7diQ5pSuBPVTUfVZ0JIqpDDWyHJsTW2RxYY9TRAFs=", + "bzlTransitiveDigest": "h/tberaO2qCsg+GOtmjDhcUHhSgIcFX4QTasIEgYpvo=", "usagesDigest": "Y9tt/cfxmAJXymZT4mCTnie92rzU5SphegIf6F+8AaM=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -786,7 +786,7 @@ "build_file": "@@//third_party/sphincsplus:BUILD.sphincsplus.bazel", "sha256": "b301faa7a42ef538323a732929d49341b1cbd8375f643f7d98ca32cd6efacc32", "patches": [ - "@@//third_party/sphincsplus:sphincsplus-namespace.patch" + "@@//third_party/sphincsplus/patches:sphincsplus-namespace.patch" ], "patch_args": [ "-p2" @@ -943,7 +943,7 @@ }, "//third_party/xkcp:extensions.bzl%xkcp": { "general": { - "bzlTransitiveDigest": "Dz8R8hb9r3rBc3oCTg9Wf9JSXuw7jfMvoUrEckHZJoU=", + "bzlTransitiveDigest": "hD9huPCM4xNamAFeas0rZQusg8jq3nyB0pdXYfi+NiM=", "usagesDigest": "qkYYTGDkeziq6h2yN6tT+eOx8e9MK0QFk+UIBidIGTE=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -960,8 +960,8 @@ "https://github.com/XKCP/XKCP/archive/56ae09923153c3e801a6891eb19e4a3b5bb6f6e2.tar.gz" ], "patches": [ - "@@//third_party/xkcp:add_config_header.patch", - "@@//third_party/xkcp:add_main_license.patch" + "@@//third_party/xkcp/patches:add_config_header.patch", + "@@//third_party/xkcp/patches:add_main_license.patch" ], "patch_args": [ "-p1" diff --git a/third_party/coremark/extensions.bzl b/third_party/coremark/extensions.bzl index 08321a13b1cd00..4a803198aa7793 100644 --- 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 new file mode 100644 index 00000000000000..3e8bb41965a28f --- /dev/null +++ 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/third_party/coremark/print_coremark_per_mhz.patch b/third_party/coremark/patches/print_coremark_per_mhz.patch similarity index 100% rename from third_party/coremark/print_coremark_per_mhz.patch rename to third_party/coremark/patches/print_coremark_per_mhz.patch diff --git a/third_party/coremark/use_ottf_main.patch b/third_party/coremark/patches/use_ottf_main.patch similarity index 100% rename from third_party/coremark/use_ottf_main.patch rename to third_party/coremark/patches/use_ottf_main.patch diff --git a/third_party/freertos/extensions.bzl b/third_party/freertos/extensions.bzl index f3ad53a8c7a7db..939d5a27eefc7a 100644 --- 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/third_party/freertos/0001-Remove-mtime-address-macros.patch b/third_party/freertos/patches/0001-Remove-mtime-address-macros.patch similarity index 100% rename from third_party/freertos/0001-Remove-mtime-address-macros.patch rename to third_party/freertos/patches/0001-Remove-mtime-address-macros.patch diff --git a/third_party/freertos/0002-Remove-references-to-stdlib.h.patch b/third_party/freertos/patches/0002-Remove-references-to-stdlib.h.patch similarity index 100% rename from third_party/freertos/0002-Remove-references-to-stdlib.h.patch rename to third_party/freertos/patches/0002-Remove-references-to-stdlib.h.patch diff --git a/third_party/freertos/0003-Replace-string.h-with-references-to-OT-memory.h.patch b/third_party/freertos/patches/0003-Replace-string.h-with-references-to-OT-memory.h.patch similarity index 100% rename from third_party/freertos/0003-Replace-string.h-with-references-to-OT-memory.h.patch rename to third_party/freertos/patches/0003-Replace-string.h-with-references-to-OT-memory.h.patch diff --git a/third_party/freertos/patches/BUILD b/third_party/freertos/patches/BUILD new file mode 100644 index 00000000000000..3e8bb41965a28f --- /dev/null +++ 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 index b56bf272a2fd03..194796b16ce46e 100644 --- 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/third_party/hsm/0001-Disable-filename-logging.patch b/third_party/hsm/patches/0001-Disable-filename-logging.patch similarity index 100% rename from third_party/hsm/0001-Disable-filename-logging.patch rename to third_party/hsm/patches/0001-Disable-filename-logging.patch diff --git a/third_party/hsm/patches/BUILD b/third_party/hsm/patches/BUILD new file mode 100644 index 00000000000000..3e8bb41965a28f --- /dev/null +++ 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 index 8d4e5c29b2a7b8..bf8c2efa56df6a 100644 --- 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/third_party/llvm_compiler_rt/0001-Headers.patch b/third_party/llvm_compiler_rt/patches/0001-Headers.patch similarity index 100% rename from third_party/llvm_compiler_rt/0001-Headers.patch rename to third_party/llvm_compiler_rt/patches/0001-Headers.patch diff --git a/third_party/llvm_compiler_rt/0002-invalid-data.patch b/third_party/llvm_compiler_rt/patches/0002-invalid-data.patch similarity index 100% rename from third_party/llvm_compiler_rt/0002-invalid-data.patch rename to third_party/llvm_compiler_rt/patches/0002-invalid-data.patch diff --git a/third_party/llvm_compiler_rt/patches/BUILD b/third_party/llvm_compiler_rt/patches/BUILD new file mode 100644 index 00000000000000..3e8bb41965a28f --- /dev/null +++ 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 index 8dc76b1fa43ab2..87de10e88100ac 100644 --- 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/third_party/open-dice/Add-a-local-strlen-implementation.patch b/third_party/open-dice/patches/Add-a-local-strlen-implementation.patch similarity index 100% rename from third_party/open-dice/Add-a-local-strlen-implementation.patch rename to third_party/open-dice/patches/Add-a-local-strlen-implementation.patch diff --git a/third_party/open-dice/patches/BUILD b/third_party/open-dice/patches/BUILD new file mode 100644 index 00000000000000..3e8bb41965a28f --- /dev/null +++ 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 index d9f3079494614c..71fb889cae2d09 100644 --- 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 new file mode 100644 index 00000000000000..3e8bb41965a28f --- /dev/null +++ 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 b/third_party/openocd/patches/calloc_transpose.patch similarity index 100% rename from third_party/openocd/calloc_transpose.patch rename to third_party/openocd/patches/calloc_transpose.patch diff --git a/third_party/openocd/reset_on_dmi_op_error.patch b/third_party/openocd/patches/reset_on_dmi_op_error.patch similarity index 100% rename from third_party/openocd/reset_on_dmi_op_error.patch rename to third_party/openocd/patches/reset_on_dmi_op_error.patch diff --git a/third_party/openocd/string_truncate_build_error.patch b/third_party/openocd/patches/string_truncate_build_error.patch similarity index 100% rename from third_party/openocd/string_truncate_build_error.patch rename to third_party/openocd/patches/string_truncate_build_error.patch diff --git a/third_party/riscv-compliance/extensions.bzl b/third_party/riscv-compliance/extensions.bzl index a32906924f9c0e..c56b39a9b796d6 100644 --- 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/third_party/riscv-compliance/0001-Add-configurable-trap-alignment-and-entry-point-to-p.patch b/third_party/riscv-compliance/patches/0001-Add-configurable-trap-alignment-and-entry-point-to-p.patch similarity index 100% rename from third_party/riscv-compliance/0001-Add-configurable-trap-alignment-and-entry-point-to-p.patch rename to third_party/riscv-compliance/patches/0001-Add-configurable-trap-alignment-and-entry-point-to-p.patch diff --git a/third_party/riscv-compliance/patches/BUILD b/third_party/riscv-compliance/patches/BUILD new file mode 100644 index 00000000000000..3e8bb41965a28f --- /dev/null +++ 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 index a075503439f20a..47401e66ae79b7 100644 --- 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 new file mode 100644 index 00000000000000..3e8bb41965a28f --- /dev/null +++ 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/third_party/sphincsplus/sphincsplus-namespace.patch b/third_party/sphincsplus/patches/sphincsplus-namespace.patch similarity index 100% rename from third_party/sphincsplus/sphincsplus-namespace.patch rename to third_party/sphincsplus/patches/sphincsplus-namespace.patch diff --git a/third_party/xkcp/extensions.bzl b/third_party/xkcp/extensions.bzl index 826eddd245bc19..4b2878249d6d92 100644 --- 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 new file mode 100644 index 00000000000000..3e8bb41965a28f --- /dev/null +++ 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 b/third_party/xkcp/patches/add_config_header.patch similarity index 100% rename from third_party/xkcp/add_config_header.patch rename to third_party/xkcp/patches/add_config_header.patch diff --git a/third_party/xkcp/add_main_license.patch b/third_party/xkcp/patches/add_main_license.patch similarity index 100% rename from third_party/xkcp/add_main_license.patch rename to third_party/xkcp/patches/add_main_license.patch