change yosys bin/share path due to yosys-symbiflow-plugins needs

.dockerignore

@@ -12,12 +12,12 @@
 !/openfpga/openfpga
 !/vpr/libvpr.a
 !/vpr/vpr
-!/yosys/share/
-!/yosys/yosys
-!/yosys/yosys-abc
-!/yosys/yosys-config
-!/yosys/yosys-filterlib
-!/yosys/yosys-smtbmc
+!/yosys/install/share/
+!/yosys/install/bin/yosys
+!/yosys/install/bin/yosys-abc
+!/yosys/install/bin/yosys-config
+!/yosys/install/bin/yosys-filterlib
+!/yosys/install/bin/yosys-smtbmc
 !/openfpga_flow
 !/openfpga.sh
 !/openfpga_flow/

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "yosys"]
 	path = yosys
 	url = https://github.com/symbiflow/yosys
+	ignore = dirty
 [submodule "yosys-plugins"]
 	path = yosys-plugins
 	url = https://github.com/SymbiFlow/yosys-symbiflow-plugins

CMakeLists.txt

@@ -229,10 +229,10 @@ include(CheckCXXCompilerFlag)
 # run makefile provided, we pass-on the options to the local make file 
 # Build Yosys
 add_custom_target(
-    yosys-main ALL
+    yosys ALL
     COMMAND $(MAKE) config-gcc
     COMMAND make clean
-    COMMAND $(MAKE) install -j10 PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/yosys/install
+    COMMAND $(MAKE) install PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/yosys/install
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yosys
     COMMENT "Compile Yosys with given Makefile"
 )
@@ -249,7 +249,7 @@ add_custom_target(
     COMMENT "Compile Yosys-plugins with given Makefile"
 )
 
-add_dependencies(yosys-plugins yosys-main)
+add_dependencies(yosys-plugins yosys)
 
 # yosys-plugins compilation ends
 

openfpga.sh

@@ -16,7 +16,6 @@ export OPENFPGA_SCRIPT_PATH="${OPENFPGA_PATH}/openfpga_flow/scripts"
 export OPENFPGA_TASK_PATH="${OPENFPGA_PATH}/openfpga_flow/tasks"
 if [ -z $PYTHON_EXEC ]; then export PYTHON_EXEC="python3"; fi
 
-
 # This function checks the path and
 # raises warning if the command is not executing
 # inside current OpendFPGA folder

openfpga_flow/misc/fpgaflow_default_tool_path.conf

@@ -1,10 +1,10 @@
 # Standard Configuration Example
 [CAD_TOOLS_PATH]
 openfpga_shell_path = ${PATH:OPENFPGA_PATH}/openfpga/openfpga
-yosys_path = ${PATH:OPENFPGA_PATH}/yosys/yosys
+yosys_path = ${PATH:OPENFPGA_PATH}/yosys/install/bin/yosys
 misc_dir = ${PATH:OPENFPGA_PATH}/openfpga_flow/misc
 odin2_path = ${PATH:OPENFPGA_PATH}/openfpga_flow/not_used_atm/odin2.exe
-abc_path = ${PATH:OPENFPGA_PATH}/yosys/yosys-abc
+abc_path = ${PATH:OPENFPGA_PATH}/yosys/install/bin/yosys-abc
 abc_mccl_path = ${PATH:OPENFPGA_PATH}/abc_with_bb_support/abc
 abc_with_bb_support_path = ${PATH:OPENFPGA_PATH}/abc_with_bb_support/abc
 vpr_path = ${PATH:OPENFPGA_PATH}/vpr/vpr