Fixes #1334: install target fails arm_hyp configs #1338
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The source layout for arm_hyp configurations uses a symlink to redirect sel4_arch include paths back to aarch32 when KernelSel4Arch is set to arm_hyp. This case wasn't being handled by the CMake install target for installing libsel4 and kernel.elf when the project is used in a standalone context. The consequence is that the ARM_HYP verified configurations would fail to install even though they would build correctly. We directly address this issue by accounting for the arm_hyp special case in the installation command where we manually resolve the symlink. If new arm_hyp symlinks are added in the future, this fix should still apply providing that the update to the CMake install target uses the same resolved sel4arch path variable introduced by this change. There is a longer-term plan to remove the arm_hyp KernelSel4Arch config value which is expected to remove these sorts of issues. Signed-off-by: Kent McLeod <[email protected]>
|
@lsf37 can we add a |
|
Also it's worth considering adding a mandatory list out output filepaths that are expected to be generated by the builds and adding an install-check phase to assert it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The source layout for arm_hyp configurations uses a symlink to redirect sel4_arch include paths back to aarch32 when KernelSel4Arch is set to arm_hyp. This case wasn't being handled by the CMake install target for installing libsel4 and kernel.elf when the project is used in a standalone context. The consequence is that the ARM_HYP verified configurations would fail to install even though they would build correctly.
We directly address this issue by accounting for the arm_hyp special case in the installation command where we manually resolve the symlink. If new arm_hyp symlinks are added in the future, this fix should still apply providing that the update to the CMake install target uses the same resolved sel4arch path variable introduced by this change.
There is a longer-term plan to remove the arm_hyp KernelSel4Arch config value which is expected to remove these sorts of issues.
Fixes #1334