Fix #432, Infer OSAL_SYSTEM_OSTYPE from OSAL_SYSTEM_BSPTYPE#436
Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom Apr 24, 2020
Merged
Conversation
The OSAL_SYSTEM_BSPTYPE specification by itself is enough to build OSAL, as it implies a specific OS layer. However, if OSAL_SYSTEM_OSTYPE is explicitly specified, it is used, but will generate a warning if it is different than the OS layer implied by the BSP, as there could be reasons for doing this during development.
Contributor
Author
|
This was originally reviewed in the 20200422 CCB, as commit 2f67435 in PR #427 but was rebased so it can be fast-tracked with nasa/cFE#634 to fix a current issue in the master branch. |
skliper
approved these changes
Apr 22, 2020
astrogeco
approved these changes
Apr 23, 2020
astrogeco
added
CCB:Approved
jphickey
pushed a commit
to jphickey/osal
that referenced
this pull request
Aug 10, 2022
Fix nasa#435: Update UT entry point Resolve merge conflicts in fsw/cfe-core/unit-test/CMakeLists.txt
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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
Simplify user configuration by inferring the
OSAL_SYSTEM_OSTYPEfrom theOSAL_SYSTEM_BSPTYPEif the former is not set. This means the user does not have to explicitly set both of these configuration options.In the event they are both explicitly set (as is done in the current configurations) but refer to an invalid/unexpected combination of OS+BSP, this adds a warning message to the CMake setup (make prep) stage, as this is likely a mis-configuration that deserves attention, but there could be valid reasons for doing this during development.
Fixes #432
Testing performed
Build OSAL for various platform combos (native, x86-linux cross, i686-rtems4.11 cross). Confirm successful build.
Expected behavior changes
No FSW affected, only build script. Also fully backward compatible with old configs.
System(s) tested on
Additional context
Prerequisite to PR nasa/cFE#634.
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.