From 2b93050c4cedc7dad7d28d09af30b5dc28b05581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Oliver=20Opdenh=C3=B6vel?= Date: Wed, 6 May 2026 14:55:36 +0100 Subject: [PATCH 1/2] Fixing incomplete abstract/static shell renaming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Oliver Opdenhövel --- linker/slashkit/emit/hw/project_gen.py | 16 ++++++++-------- .../resources/base/scripts/build_project.tcl | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/linker/slashkit/emit/hw/project_gen.py b/linker/slashkit/emit/hw/project_gen.py index eb362a1c..8ffc5840 100644 --- a/linker/slashkit/emit/hw/project_gen.py +++ b/linker/slashkit/emit/hw/project_gen.py @@ -226,13 +226,13 @@ def _run_rm_build(config: LinkerConfiguration, rm_kind: RM_KIND) -> None: if rm_kind == RM_KIND.SERVICE_LAYER: tcl_name = "service_layer_build.tcl" - stat_shell_dcp_name = "stat_shell_service_layer.dcp" + static_shell_dcp_name = "static_shell_service_layer.dcp" base_bd_package = "slashkit.resources.static_shell.service_layer" base_bd_name = "service_layer.bd" log_path = logs_dir / "service_layer_build.log" else: tcl_name = "slash_project_build.tcl" - stat_shell_dcp_name = "stat_shell_slash.dcp" + static_shell_dcp_name = "static_shell_slash.dcp" base_bd_package = "slashkit.resources.static_shell.slash_base" base_bd_name = "slash_base.bd" log_path = logs_dir / "slash_project_build.log" @@ -241,9 +241,9 @@ def _run_rm_build(config: LinkerConfiguration, rm_kind: RM_KIND) -> None: tcl_path = stack.enter_context( resources.path("slashkit.resources.base.scripts", tcl_name) ) - stat_shell_dcp_path = stack.enter_context( + static_shell_dcp_path = stack.enter_context( resources.path("slashkit.resources.static_shell", - stat_shell_dcp_name) + static_shell_dcp_name) ) base_bd_path = stack.enter_context( resources.path(base_bd_package, base_bd_name) @@ -263,8 +263,8 @@ def _run_rm_build(config: LinkerConfiguration, rm_kind: RM_KIND) -> None: config.project_name, "--ip-repo", str(config.ip_repository), - "--stat-shell-dcp", - str(stat_shell_dcp_path), + "--static-shell-dcp", + str(static_shell_dcp_path), "--base-bd", str(base_bd_path), "--linker-results-dir", @@ -334,8 +334,8 @@ def install_static_shell(config: InstallerConfiguration) -> None: impl_dir = config.build_dir / "slash.runs" / "impl_1" dcp_sources = ( impl_dir / "top_wrapper_routed_bb.dcp", - impl_dir / "stat_shell_slash.dcp", - impl_dir / "stat_shell_service_layer.dcp", + impl_dir / "static_shell_slash.dcp", + impl_dir / "static_shell_service_layer.dcp", ) for src in dcp_sources: if not src.exists(): diff --git a/linker/slashkit/resources/base/scripts/build_project.tcl b/linker/slashkit/resources/base/scripts/build_project.tcl index 1d3718b0..71bc9b93 100644 --- a/linker/slashkit/resources/base/scripts/build_project.tcl +++ b/linker/slashkit/resources/base/scripts/build_project.tcl @@ -44,8 +44,8 @@ proc build_project {{proj_name "user"}} { open_run impl_1 set impl_output_dir [get_property DIRECTORY [current_run]] - write_abstract_shell -cell top_i/slash -force [file join $impl_output_dir "abs_shell_slash.dcp"] - write_abstract_shell -cell top_i/service_layer -force [file join $impl_output_dir "abs_shell_service_layer.dcp"] + write_abstract_shell -cell top_i/slash -force [file join $impl_output_dir "static_shell_slash.dcp"] + write_abstract_shell -cell top_i/service_layer -force [file join $impl_output_dir "static_shell_service_layer.dcp"] puts "INFO: Implementation complete for run 'impl_1'." } From fc378fd658d8f8c8f7cfd7f73cc11cf952b90393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Oliver=20Opdenh=C3=B6vel?= Date: Thu, 7 May 2026 09:46:10 +0100 Subject: [PATCH 2/2] Fixing remaining build system bugs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Oliver Opdenhövel --- packaging/debian/{v80++.install => slashkit.install} | 0 scripts/run-with-docker.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename packaging/debian/{v80++.install => slashkit.install} (100%) diff --git a/packaging/debian/v80++.install b/packaging/debian/slashkit.install similarity index 100% rename from packaging/debian/v80++.install rename to packaging/debian/slashkit.install diff --git a/scripts/run-with-docker.sh b/scripts/run-with-docker.sh index 1119627a..93c1cd0e 100755 --- a/scripts/run-with-docker.sh +++ b/scripts/run-with-docker.sh @@ -117,7 +117,7 @@ fi # and then either run bash or the packaging script # This block also cks the container argument. DOCKER_COMMAND="source $SLASH_XILINX_PATH/2025.1/Vivado/settings64.sh " -DOCKER_COMMAND+="&& export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:$SLASH_XILINX_PATH/2025.1/Vivado/lib/lnx64.0 " +DOCKER_COMMAND+="&& export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:$SLASH_XILINX_PATH/2025.1/Vivado/lib/lnx64.o " if [ $CONTAINER = "package" ]; then DOCKER_COMMAND+="&& $PACKAGE_SCRIPT " elif [ $CONTAINER = "run" ]; then