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 #790, allow directories and symlinks in FILELIST. #1158

Merged

Conversation

jphickey
Copy link
Contributor

@jphickey jphickey commented Feb 5, 2021

Describe the contribution
Checks a name-based subdirectory under ${MISSION_DEFS} for files listed in the FILELIST for that target. If file is a symlink, the link should be followed so the correct content is installed, not a symlink.

Fixes #790

Testing performed
Created a symlink in a target name subdirectory (see additional context) and confirm that the correct file content is installed.

Expected behavior changes
Items in FILELIST can be in a target name directory, and may be symlinks.

System(s) tested on
Ubuntu 20.04

Additional context
This also adds another "NOTE" message to indicate exactly what file is being used, after all lookup/de-mapping logic is done, e.g. I made a symlink to test this out:

$ cd sample_defs
$ mv cpu1_cfe_es_startup.scr test_startup.scr
$ mkdir cpu1
$ cd cpu1
$ ln -s ../test_startup.scr cfe_es_startup.scr
$ cd ../..
$ make prep
<<snipped>>
NOTE: Selected /home/joe/code/cfecfs/github/sample_defs/test_startup.scr as source for cfe_es_startup.scr on cpu1

This is similar to all the other informational messages for table sources and app sources indicating where they were found.

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

Checks a name-based subdirectory under ${MISSION_DEFS} for
files listed in the FILELIST for that target.

If file is a symlink, the link should be followed so the correct
content is installed, not a symlink.
@jphickey jphickey added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Feb 5, 2021
@astrogeco
Copy link
Contributor

CCB 2021-02-17 APPROVED

  • Supports having different versions of files for different CPUs by using directories in MISSION_DEFS

@astrogeco astrogeco removed the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Feb 17, 2021
@astrogeco astrogeco changed the base branch from main to integration-candidate February 24, 2021 03:10
@astrogeco astrogeco merged commit 9fd5d76 into nasa:integration-candidate Feb 24, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Feb 26, 2021
@jphickey jphickey deleted the fix-790-install-symlink branch March 10, 2021 14:43
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
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.

Allow target name subdirectory for install files and handle symlinks
3 participants