bump openlane version and use --docker-no-tty

efabless · Aug 24, 2023 · cc50eaa · cc50eaa
1 parent 63001b9
commit cc50eaa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -43,7 +43,7 @@ ifeq ($(PDK),sky130A)
 	SKYWATER_COMMIT=f70d8ca46961ff92719d8870a18a076370b85f6c
 	export OPEN_PDKS_COMMIT?=e3b630d9b7c0e23615367d52c4f78b2d2ede58ac
 	export OPENLANE_TAG=2023.07.19
-	export OPENLANE2_TAG?=2.0.0-b9
+	export OPENLANE2_TAG?=2.0.0-b10
 	MPW_TAG ?= mpw-9d
 
 ifeq ($(CARAVEL_LITE),1)
@@ -62,7 +62,7 @@ ifeq ($(PDK),sky130B)
 	SKYWATER_COMMIT=f70d8ca46961ff92719d8870a18a076370b85f6c
 	export OPEN_PDKS_COMMIT?=e3b630d9b7c0e23615367d52c4f78b2d2ede58ac
 	export OPENLANE_TAG=2023.07.19
-	export OPENLANE2_TAG?=2.0.0-b9
+	export OPENLANE2_TAG?=2.0.0-b10
 	MPW_TAG ?= mpw-9d
 
 ifeq ($(CARAVEL_LITE),1)
@@ -85,7 +85,7 @@ ifeq ($(PDK),gf180mcuC)
 	CARAVEL_TAG := $(MPW_TAG)
 	export OPEN_PDKS_COMMIT?=e3b630d9b7c0e23615367d52c4f78b2d2ede58ac
 	export OPENLANE_TAG=2023.07.19
-	export OPENLANE2_TAG?=2.0.0-b9
+	export OPENLANE2_TAG?=2.0.0-b10
 
 endif
 

diff --git a/openlane/Makefile b/openlane/Makefile
@@ -57,7 +57,7 @@ docker_mounts += -m $(MCW_ROOT)
 endif
 
 docker_startup_mode = $(shell test -t 0 && echo "-it" || echo "--rm" )
-openlane_extra_args = $(shell test -t 0 || echo "--log-level WARN")
+openlane_extra_args = $(shell test -t 0 || echo "--docker-no-tty")
 docker_run = \
 	docker run $(docker_startup_mode) \
 	$(USER_ARGS) \
@@ -75,7 +75,7 @@ $(designs) : % : $(PROJECT_ROOT)/openlane/%/config.json
 ifeq ($(OPENLANE2_USE_NIX),1)
 	nix-shell --pure --command "openlane $(openlane_args) $(openlane_extra_args)"
 else
-	$(PROJECT_ROOT)/openlane2-venv/bin/python3 -m openlane $(docker_mounts) --dockerized $(openlane_args) $(openlane_extra_args)
+	$(PROJECT_ROOT)/openlane2-venv/bin/python3 -m openlane $(docker_mounts) $(openlane_extra_args) --dockerized $(openlane_args) $(openlane_extra_args)
 endif
 	@rm -rf $(PROJECT_ROOT)/openlane/$*/runs/$*
 	@ln -s $$(realpath $(PROJECT_ROOT)/openlane/$*/runs/$(OPENLANE2_RUN_TAG)) $(PROJECT_ROOT)/openlane/$*/runs/$*