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

Fix #1070, patch PSP include directory reference #1138

Closed
wants to merge 1 commit into from

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Jan 28, 2021

Describe the contribution
Copy of #1072 but main target (Caelum development)

Testing performed
Nothing new, #1072 tested the fix

Expected behavior changes
PSP modules should be able to build again

System(s) tested on
NA, leveraging previous tests

Additional context
Maybe add a PSP module test into the matrix to catch issues like this?

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

The PSP header files are located in fsw/shared/inc, not fsw/shared.
This corrects the reference.
@skliper
Copy link
Contributor Author

skliper commented Jan 28, 2021

Or do we want to update w/ --ours and then can use the same commit?

@skliper
Copy link
Contributor Author

skliper commented Jan 28, 2021

Disregard... just needed to merge -s ours with v6.8.0-rc2 on main and can use #1137

@skliper skliper closed this Jan 28, 2021
@skliper skliper deleted the fix1070-psp_includedir_mainbase branch October 22, 2021 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants