Skip to content
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.

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

Change examples/virtio to use new Makefile snippet system #79

Merged
merged 25 commits into from
Aug 5, 2024

Conversation

alexandermbrown
Copy link
Contributor

@alexandermbrown alexandermbrown commented Jul 9, 2024

Similar to #77 but for examples/virtio.

@alexandermbrown alexandermbrown force-pushed the alexbr/improve-virtio-makefile branch from f0daed1 to 1d38844 Compare July 9, 2024 01:24
@alexandermbrown alexandermbrown marked this pull request as ready for review July 9, 2024 03:53
@alexandermbrown
Copy link
Contributor Author

@wom-bat would you be able to have a look at this PR as well?

examples/virtio/Makefile Show resolved Hide resolved
examples/virtio/Makefile Show resolved Hide resolved
examples/virtio/board/odroidc4/virtio.system Outdated Show resolved Hide resolved
examples/virtio/Makefile Show resolved Hide resolved
@alexandermbrown alexandermbrown marked this pull request as draft July 15, 2024 03:48
@alexandermbrown alexandermbrown force-pushed the alexbr/improve-virtio-makefile branch from 5ca8f2d to fadb281 Compare July 15, 2024 03:52
@alexandermbrown alexandermbrown marked this pull request as ready for review July 15, 2024 04:50
@alexandermbrown
Copy link
Contributor Author

This is ready for review again but we need to review/merge au-ts/sddf#152 before merging this one

@alexandermbrown alexandermbrown self-assigned this Jul 15, 2024
@alexandermbrown alexandermbrown requested a review from wom-bat July 15, 2024 23:25
@alexandermbrown alexandermbrown force-pushed the alexbr/improve-virtio-makefile branch from b73b7c4 to a85eae3 Compare July 16, 2024 02:42
Signed-off-by: Alex Brown <[email protected]>
Some snippets require LIBS to be defined such as sddf's
network_components.mk. Without this, we get linking errors as microkit
is not linked.

Signed-off-by: Alex Brown <[email protected]>
@alexandermbrown alexandermbrown force-pushed the alexbr/improve-virtio-makefile branch from a85eae3 to 7b62f46 Compare July 22, 2024 00:38
Comment on lines 7 to 9
ifeq ($(strip $(LIBVMM)),)
$(error LIBVMM must be specified)
endif
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not do LIBVMM ?= ../../?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could do:

LINUX_BLK_DIR := $(abs $(dir $(last ${MAKEFILES_LIST}))
LIBVMM ?= $(realpath ${LINUX_BLK_DIR)}/../../)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done 282cad9

Without PRECIOUS, intermediate files (i.e., %_vm/*) are deleted

Signed-off-by: Alex Brown <[email protected]>
Before make tried to delete directory `init.d`. Add file filter to find
command to ensure we only delete dependency files.

Signed-off-by: Alex Brown <[email protected]>
vm.dts needs to depend on the CFLAGS as if the board is changed the dts
files must be updated as well.

Signed-off-by: Alex Brown <[email protected]>
Comment on lines 7 to 9
ifeq ($(strip $(LIBVMM)),)
$(error LIBVMM must be specified)
endif
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could do:

LINUX_BLK_DIR := $(abs $(dir $(last ${MAKEFILES_LIST}))
LIBVMM ?= $(realpath ${LINUX_BLK_DIR)}/../../)

tools/linux/blk/blk_init.mk Show resolved Hide resolved
tools/linux/uio/uio.mk Show resolved Hide resolved
@Ivan-Velickovic
Copy link
Collaborator

I think all the feedback has been addressed now, can you squash the commits into one and then we can merge.

@Ivan-Velickovic Ivan-Velickovic merged commit 327a9fe into main Aug 5, 2024
6 of 7 checks passed
@Ivan-Velickovic Ivan-Velickovic deleted the alexbr/improve-virtio-makefile branch August 5, 2024 00:52
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.

3 participants