Fix #1070, patch PSP include directory reference #1072
Merged
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 PSP header files are located in fsw/shared/inc, not fsw/shared. This corrects the reference.
jphickey
added
the
CCB:Ready
skliper
approved these changes
Jan 7, 2021
|
CCB:2021-01-13 APPROVED Once this is merged will open PR to merge 6.8.x into Caelum. |
astrogeco
added
CCB:2021-01-13
and removed
CCB:Ready
|
@astrogeco Is there something preventing this one from merge? |
Just time to sit down and update the Bootes bundle and tag stuff. I guess I should merge it and deal with that later |
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Jan 27, 2021
astrogeco
added a commit
to astrogeco/cFS
that referenced
this pull request
Jan 27, 2021
Getting it into main is the higher priority on my side, it's broken in main which is being evaluated by numerous stakeholders. |
This was referenced Jan 28, 2021
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.
Describe the contribution
The PSP header files are located in fsw/shared/inc, not fsw/shared.
This corrects the reference.
Fixes #1070
Testing performed
Modify local config to use "eeprom_stub" PSP module to implement eeprom functions, which reproduces the build failure - I confirmed the error with respect to
#include "cfe_psp.h"With this patch applied, the build succeeds again.
Expected behavior changes
None
System(s) tested on
Ubuntu 20.04
Additional context
This PR is based on Bootes RC2 as the bug exists there, recommend to patch it in prior to final release.
Should also merge this forward to
mainas the bug exists there too and this is the easiest short term fix.Longer term fix should be #626 to prevent this type of issue from recurring.
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.