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

Oss repo cleanup #7

Merged
merged 7 commits into from
Oct 3, 2023
Merged

Oss repo cleanup #7

merged 7 commits into from
Oct 3, 2023

Conversation

DavidEdell
Copy link
Contributor

NOTE: This PR includes changes in the feature/cfdp branch.

TL;DR – We can revert all apps to the NASA repos with the exception of CF[DP] (bugfixes that should be cleaned up and fed back), and a trivial CMakeListst.txt bugfix to TO_LAB and SCH_LAB. All changes below pushed to CFS repo branch oss_repo_cleanup, which includes the CF[DP] additions but does not include migrating cfe/psp/osal to upstream.

• CFE Tables can be overridden from sample_defs/tables
o This is a standard feature of the cfe build system
• Include files can be overridden by placing alternate versions in sample_defs/config which will be copied to build/inc (which is first in the include paths)
o NOTE: This is not a part of the standard cfe build system. I would assume that there is a standard way of doing this, but I’ve been unable to find it.
o This new copy rule is defined in sample_defs/mission_build_custom.cmake
• Status of repos (ignoring upstream changes since our last merge)
o Cfs repo on branch feature/repo_cleanup
o Cfe and psp can be moved directly to the upstream repo
o Osal – The only change is the patch that Steve pushed the other day for fixing the pipeline build. We should submit this upstream as a bug report and hope we can reconcile later.
o Ci_lab moved to latest upstream
o Cf
 On a fork of the upstream repository
 Reverted the last commit and created new “sbn_compatibility” branch.
 Brash-specific changes are found in sample_defs/tables and sample_defs/config folders
 The only changes within our fork are bugfixes for compatibility with SBN (allow non-local subscriptions) and fixing some error handling that was causing cfe to crash in certain cases. And a change to the build settings to disable doxygen generation because that step is breaking our build for unknown reasons.
o Sample_app and sample_lib
 These are demo applications. Recommend we remove them from our repository
o SBN – migrated to upstream
 Wireshark plugin – We do have a more updated version of the plugin that we wrote and have stored in https://bitbucket.org/traclabs/cfe_sbn_bridge_plugin/src/devel/tools/
• Ours is a different implementation than NASA’s. They probably wouldn’t take it as-is, but we may want to share it on the NASA SBN github once our repos are available open-source in case somebody wants to try merging them
• Note: It appears that we also committed an early version of our plugin over the NASA one in our fork at some point.
 Modules/filter/remap/fsw/tables/sbn_remap_tbl.c – We added curly braces for some reason.
 Sbn_msgids.h, sbn_platform_cfg.h – Override in sample_defs/config instead
 Sbn_conf_table.c – We changed from POLL to RECV mode. Override in sample_defs/table instead.
o Sch_lab and to_lab
 Brash-specific changes limited to table and msgids.h, both moved to override folder for both applications
 A simple one-line change to CMakeLists.txt made on top of upstream repository.
• Note: The same change applies to both repositories and replaces a hard-coded list of applications in CMakeLists.txt with a variable.
• I created a ticket in the upstream to_lab so hopefully they will fix this one.
 NEW Branch: new_main contains my change on top of the latest upstream. DO NOT merge with our existing forked changes
o Robot_sim, ros_app
 Branch oss_repo_cleanup created to add missing definition to CMakeLists.txt that allows the sch_lab and to_lab magic above to work
o

@swhart115 swhart115 merged commit b45d640 into main Oct 3, 2023
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.

2 participants