Skip to content

Fixing small errors in the rebuilt packaging system #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
quetric merged 2 commits into from
May 7, 2026
+11 −11
Merged

Fixing small errors in the rebuilt packaging system #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b93050
Fixing incomplete abstract/static shell renaming
JOOpdenhoevel May 6, 2026
fc378fd
Fixing remaining build system bugs
JOOpdenhoevel May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions linker/slashkit/emit/hw/project_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
Expand All @@ -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",
Expand Down Expand Up @@ -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():
Expand Down
4 changes: 2 additions & 2 deletions linker/slashkit/resources/base/scripts/build_project.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'."
}
0 packaging/debian/v80++.install → packaging/debian/slashkit.install
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/run-with-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading