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.

Sign up for GitHub

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

Jump to bottom

Fix #35, Build fails with deprecated cFE/OSAL elements removed #36

Merged
merged 1 commit into from
Feb 26, 2020
Merged

Fix #35, Build fails with deprecated cFE/OSAL elements removed #36

merged 1 commit into from
Feb 26, 2020

Conversation

dmknutsen
Copy link
Contributor

Describe the contribution
Fixes #35, Build fails with deprecated cFE/OSAL elements removed

Testing performed
Nominal build process:

make distclean
make prep
make
make install
followed by building with OMIT_DEPRECATED = true
make distclean
make OMIT_DEPRECATED=true prep
make
make install

Confirmed clean build in both cases.

Expected behavior changes
Clean build when OMIT_DEPRECATED = true

System(s) tested on
Oracle VM VirtualBox
OS: ubuntu-18.04.3
Versions: cFE 6.7.5.0, OSAL 5.0.5.0, PSP 1.4.3.0

Additional context
There is a total of three pull requests to address issue_35:
nasa/to_lab
nasa/sample_app
nasa/sch_lab

All three are intended to be delivered together.

Contributor Info
Dan Knutsen
GSFC/NASA

@astrogeco astrogeco changed the title Issue 35 Fix #35, Build fails with deprecated cFE/OSAL elements removed Feb 11, 2020
@astrogeco astrogeco added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Feb 11, 2020
jphickey
jphickey approved these changes Feb 11, 2020
View reviewed changes
Copy link
Contributor

@jphickey jphickey left a comment

Choose a reason for hiding this comment

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

The code changes changes look fine, but please edit the commit log prior to (or as part of) the final merge cycle.

@astrogeco astrogeco added this to the 1.2.0 milestone Feb 11, 2020
@astrogeco astrogeco added CCB - 20200213 CCB:Ignore Pull Request is NOT ready for discussion. Has open actions. Will be re-examined at by next CCB. CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) and removed CCB - 20200213 CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) CCB:Ignore Pull Request is NOT ready for discussion. Has open actions. Will be re-examined at by next CCB. labels Feb 11, 2020
@astrogeco
Copy link
Contributor

CCB 20200212 - Approved

@astrogeco astrogeco added CCB:Approved Indicates code approval by CCB and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Feb 13, 2020
@astrogeco astrogeco changed the base branch from master to ic-20200226 February 25, 2020 19:25
@astrogeco
Copy link
Contributor

The code changes changes look fine, but please edit the commit log prior to (or as part of) the final merge cycle.

Force-pushed with fixed commit message

@astrogeco astrogeco merged commit 948b921 into nasa:ic-20200226 Feb 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jphickey jphickey jphickey approved these changes

Assignees
No one assigned
Labels
CCB:Approved Indicates code approval by CCB
Projects
None yet
Milestone
Bootes
Development

Successfully merging this pull request may close these issues.

Build fails with deprecated cFE/OSAL elements removed
3 participants
@dmknutsen @astrogeco @jphickey