Skip to content

Update dkms-edge.cmake to match the latest dir structure#9726

Merged
chvamshi-xilinx merged 1 commit intoXilinx:masterfrom
ManojTakasi:ubuntu
Apr 14, 2026
Merged

Update dkms-edge.cmake to match the latest dir structure#9726
chvamshi-xilinx merged 1 commit intoXilinx:masterfrom
ManojTakasi:ubuntu

Conversation

@ManojTakasi
Copy link
Copy Markdown
Collaborator

Problem solved by the commit

Edge DKMS staging did not install XRT memory headers in the layout the zocl driver expects (xclhal2_mem.h -> xrt/detail/xrt_mem.h, and top-level xrt_mem.h for -I paths that reference it). Flattening those into driver/zocl/include via the same install(FILES) loop broke includes.

Bug / issue (if any) fixed, which PR introduced the bug, how it was discovered

How problem was solved, alternative solutions (if any) and why they were rejected

Split flat core headers from xrt_mem.h / xrt/detail/xrt_mem.h, with two explicit install() rules targeting ${XRT_DKMS_INSTALL_DIR}/include/

COMPONENT ${XRT_COMPONENT} on all DKMS-related install() rules so edge artifacts align with XRT’s component-based install/packaging.

Risks (if any) associated the changes in the commit

low..these changes only impact on dkms edge flow.

What has been tested and how, request additional testing if necessary

Tested by running vadd application on kria som kv260 using limerick ubuntu 24.04 image

Documentation impact (if any)

Signed-off-by: Takasi, Manoj <Manoj.Takasi@amd.com>
@github-actions
Copy link
Copy Markdown
Contributor

clang-tidy review says "All clean, LGTM! 👍"

@chvamshi-xilinx chvamshi-xilinx merged commit 7130037 into Xilinx:master Apr 14, 2026
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants