Skip to content

Commit eafadcd

Browse files
committed
bazel: bump bazel-orfs ef90d6c -> 3a5ddd7, all vendored patches now upstream
All five vendored bazel-orfs patches (0001..0005) landed upstream in this bump window, in the same order with matching subjects: 1f4f12e flow.bzl: pull synth into generate_metadata data deps b3b19b0 blender.bzl: export blender_supports_pdk predicate 4b3ae0 orfs_design.bzl: forward blender, silently skip unsupported PDKs f4e25a3 environment.bzl: pull src OrfsDepInfo.files into source_inputs 3a5ddd7 render_gds: trim layerstack before Blender import for fast-turnaround viewer Drop them all -- `git apply --check --reverse` confirms 0001..0004 match upstream exactly, and 0005's upstream version is the same patch modulo a small context drift that doesn't matter once the patch isn't re-applied locally. patches/bazel-orfs/ goes away entirely. `bazelisk query //flow/designs/sky130hd/microwatt:microwatt_final_blender_html` succeeds after the change, so MODULE.bazel resolution still produces the expected target with no vendored patches. Signed-off-by: Øyvind Harboe <oyvind@ascenium.com> Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
1 parent 239d47b commit eafadcd

7 files changed

Lines changed: 1 addition & 566 deletions

MODULE.bazel

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ bazel_dep(name = "bazel-orfs")
4444

4545
bazel_dep(name = "bazel-orfs-verilog", dev_dependency = True)
4646

47-
BAZEL_ORFS_COMMIT = "ef90d6c41fa8c1ebd5808371e82d33fee3ab1679"
47+
BAZEL_ORFS_COMMIT = "3a5ddd7eb48c363717e65903ae4573d528327fd3"
4848

4949
BAZEL_ORFS_REMOTE = "https://github.com/The-OpenROAD-Project/bazel-orfs.git"
5050

@@ -57,14 +57,6 @@ BAZEL_ORFS_REMOTE = "https://github.com/The-OpenROAD-Project/bazel-orfs.git"
5757
git_override(
5858
module_name = "bazel-orfs",
5959
commit = BAZEL_ORFS_COMMIT,
60-
patch_strip = 1,
61-
patches = [
62-
"//patches/bazel-orfs:0001-flow.bzl-pull-synth-into-generate_metadata-data-deps.patch",
63-
"//patches/bazel-orfs:0002-blender.bzl-export-blender_supports_pdk-predicate.patch",
64-
"//patches/bazel-orfs:0003-orfs_design.bzl-forward-blender-silently-skip-unsupp.patch",
65-
"//patches/bazel-orfs:0004-environment.bzl-pull-src-OrfsDepInfo.files-into-sour.patch",
66-
"//patches/bazel-orfs:0005-render_gds-log-phase-VmRSS-and-capture-op-tracebacks.patch",
67-
],
6860
remote = BAZEL_ORFS_REMOTE,
6961
)
7062

patches/bazel-orfs/0001-flow.bzl-pull-synth-into-generate_metadata-data-deps.patch

Lines changed: 0 additions & 60 deletions
This file was deleted.

patches/bazel-orfs/0002-blender.bzl-export-blender_supports_pdk-predicate.patch

Lines changed: 0 additions & 45 deletions
This file was deleted.

patches/bazel-orfs/0003-orfs_design.bzl-forward-blender-silently-skip-unsupp.patch

Lines changed: 0 additions & 70 deletions
This file was deleted.

patches/bazel-orfs/0004-environment.bzl-pull-src-OrfsDepInfo.files-into-sour.patch

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)