fix conflicts and update OR

Signed-off-by: Jonas Gava <jfgava@precisioninno.com>

Author: jfgava

.bazelrc

@@ -1,3 +1,13 @@
+# yosys 0.64 is not yet in BCR; add the unmerged PR's fork as a fallback
+# registry until bazelbuild/bazel-central-registry#8862 lands.  BCR is
+# listed first so all other modules resolve from the official source;
+# the fork is only consulted for modules/versions BCR doesn't carry yet.
+# The commit hash makes the fork reference immutable.  Mirrors what
+# bazel-orfs/.bazelrc does upstream — ORFS root has its own .bazelrc so
+# the upstream lines don't propagate automatically.
+common --registry=https://bcr.bazel.build/
+common --registry=https://raw.githubusercontent.com/oharboe/bazel-central-registry/0586b398db6edd245da97cbec29e26c5e2a808d7/
+
 build --incompatible_strict_action_env
 build --cxxopt "-std=c++20" --host_cxxopt "-std=c++20"
 

.dockerignore

@@ -1,4 +1,7 @@
 # Build working directories
+tools/OpenROAD/build/
+tools/yosys-slang/build/
+tools/kepler-formal/build/
 
 # Build files
 build_openroad.log

MODULE.bazel

@@ -36,23 +36,14 @@ git_override(
 bazel_dep(name = "bazel-orfs", dev_dependency = True)
 bazel_dep(name = "bazel-orfs-verilog", dev_dependency = True)
 
-BAZEL_ORFS_COMMIT = "3a5ddd7eb48c363717e65903ae4573d528327fd3"
+BAZEL_ORFS_COMMIT = "6ebadeb4be5c9ada103081c9a5e668c014126616"
 
 BAZEL_ORFS_REMOTE = "https://github.com/The-OpenROAD-Project/bazel-orfs.git"
 
 # To bump version, run: bazelisk run @bazel-orfs//:bump
-#
-# `patches =` keeps small bazel-orfs fixes vendored in this repo while
-# we iterate, instead of round-tripping every change through a
-# bazel-orfs PR + pin bump.  When a patch lands upstream, drop the
-# entry here and bump BAZEL_ORFS_COMMIT.
 git_override(
     module_name = "bazel-orfs",
     commit = BAZEL_ORFS_COMMIT,
-    patch_strip = 1,
-    patches = [
-        "//patches/bazel-orfs:0001-render_gds-monkey-patch-PDK_CONFIGS-not-gdsii_use_custom_config.patch",
-    ],
     remote = BAZEL_ORFS_REMOTE,
 )
 

docker/Dockerfile.builder

@@ -45,6 +45,19 @@ if [ -n "${verificPath}" ]; then
 fi
 EOF
 
+# Collect LICENSE files from tool source trees into the install directory so
+# they are available in the final image. tools/OpenROAD/src/sta is excluded
+# because it is covered by a separate commercial license agreement.
+RUN find /OpenROAD-flow-scripts/tools \( -name "*LICENSE*" -o -name "*LICENSES*" \) \
+    | grep -v '/OpenROAD/src/sta/' \
+    | grep -v '/AutoTuner/' \
+    | grep -v '^/OpenROAD-flow-scripts/tools/install/' \
+    | while IFS= read -r f; do \
+        rel="${f#/OpenROAD-flow-scripts/tools/}"; \
+        mkdir -p "/OpenROAD-flow-scripts/tools/install/licenses/$(dirname "$rel")"; \
+        cp -r "$f" "/OpenROAD-flow-scripts/tools/install/licenses/$rel"; \
+    done
+
 FROM orfs-base
 
 # The order for copying the directories is based on the frequency of changes (ascending order),

flow/designs/nangate45/ariane133/rules-base.json

@@ -62,7 +62,7 @@
         "compare": ">="
     },
     "globalroute__timing__setup__tns": {
-        "value": -570.0,
+        "value": -572.0,
         "compare": ">="
     },
     "globalroute__timing__hold__ws": {
@@ -94,7 +94,7 @@
         "compare": ">="
     },
     "finish__timing__setup__tns": {
-        "value": -577.0,
+        "value": -606.0,
         "compare": ">="
     },
     "finish__timing__hold__ws": {

flow/designs/sky130hd/microwatt/rules-base.json

@@ -62,7 +62,7 @@
         "compare": ">="
     },
     "globalroute__timing__setup__tns": {
-        "value": -322.0,
+        "value": -345.0,
         "compare": ">="
     },
     "globalroute__timing__hold__ws": {
@@ -94,7 +94,7 @@
         "compare": ">="
     },
     "finish__timing__setup__tns": {
-        "value": -336.0,
+        "value": -360.0,
         "compare": ">="
     },
     "finish__timing__hold__ws": {
@@ -109,4 +109,4 @@
         "value": 5572106,
         "compare": "<="
     }
-}
+}