From 05e4817f3babf53afee9d1a94a9a84155a9e19a4 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 20 Apr 2022 07:40:15 -0600 Subject: [PATCH 1/3] Fix #1225, Update codeql workflows for reusable update --- .github/workflows/codeql-cfe-build.yml | 4 +--- .github/workflows/codeql-osal-default.yml | 9 +++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/codeql-cfe-build.yml b/.github/workflows/codeql-cfe-build.yml index 793e88978..9a4a5099e 100644 --- a/.github/workflows/codeql-cfe-build.yml +++ b/.github/workflows/codeql-cfe-build.yml @@ -9,7 +9,5 @@ jobs: name: CodeQl Analysis uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main with: - make: 'make -j native/default_cpu1/osal/' component-path: osal - test: true - \ No newline at end of file + make: 'make -C build/native/default_cpu1/osal' diff --git a/.github/workflows/codeql-osal-default.yml b/.github/workflows/codeql-osal-default.yml index 0509f7280..748faa93c 100644 --- a/.github/workflows/codeql-osal-default.yml +++ b/.github/workflows/codeql-osal-default.yml @@ -7,8 +7,9 @@ on: jobs: codeql: name: CodeQl Analysis - uses: nasa/cFS/.github/workflows/codeql-build.yml@main + uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main with: - setup: 'cd osal && cp Makefile.sample Makefile' - make-prep: 'cd osal && make prep' - make: 'cd osal && make -j' \ No newline at end of file + component-path: cFS # Causes reusable workflow to not checkout bundle + setup: 'cp Makefile.sample Makefile' + prep: 'make prep' + make: 'make' From 3c6ae5aae43d9bda4b65f78594981a989a6563ff Mon Sep 17 00:00:00 2001 From: Alan Cudmore Date: Mon, 25 Apr 2022 08:24:41 -0700 Subject: [PATCH 2/3] FIX #1248, add os-impl-no-select.c for RTEMS --- src/os/portable/os-impl-no-select.c | 78 +++++++++++++++++++++++++++++ src/os/rtems/CMakeLists.txt | 3 +- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 src/os/portable/os-impl-no-select.c diff --git a/src/os/portable/os-impl-no-select.c b/src/os/portable/os-impl-no-select.c new file mode 100644 index 000000000..37b95a356 --- /dev/null +++ b/src/os/portable/os-impl-no-select.c @@ -0,0 +1,78 @@ +/************************************************************************ + * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * + * Copyright (c) 2020 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + +/** + * \file os-impl-no-select.c + * \author joseph.p.hickey@nasa.gov + * + * Purpose: All functions return OS_ERR_NOT_IMPLEMENTED. + * This is used when network functionality is disabled by config. + */ + +/**************************************************************************************** + INCLUDE FILES + ***************************************************************************************/ + +#include +#include "os-shared-select.h" + +/**************************************************************************************** + DEFINES + ***************************************************************************************/ + +/*************************************************************************************** + FUNCTION PROTOTYPES + **************************************************************************************/ + +/**************************************************************************************** + GLOBAL DATA + ***************************************************************************************/ + +/**************************************************************************************** + LOCAL FUNCTIONS + ***************************************************************************************/ + +/**************************************************************************************** + SELECT API + ***************************************************************************************/ + +/*---------------------------------------------------------------- + * + * Function: OS_SelectSingle_Impl + * + * Purpose: Implemented per internal OSAL API + * See prototype for argument/return detail + * + *-----------------------------------------------------------------*/ +int32 OS_SelectSingle_Impl(const OS_object_token_t *token, uint32 *SelectFlags, int32 msecs) +{ + return OS_ERR_NOT_IMPLEMENTED; +} /* end OS_SelectSingle_Impl */ + +/*---------------------------------------------------------------- + * + * Function: OS_SelectMultiple_Impl + * + * Purpose: Implemented per internal OSAL API + * See prototype for argument/return detail + * + *-----------------------------------------------------------------*/ +int32 OS_SelectMultiple_Impl(OS_FdSet *ReadSet, OS_FdSet *WriteSet, int32 msecs) +{ + return OS_ERR_NOT_IMPLEMENTED; +} /* end OS_SelectMultiple_Impl */ diff --git a/src/os/rtems/CMakeLists.txt b/src/os/rtems/CMakeLists.txt index 70d9c5947..523547b63 100644 --- a/src/os/rtems/CMakeLists.txt +++ b/src/os/rtems/CMakeLists.txt @@ -30,7 +30,6 @@ set(RTEMS_BASE_SRCLIST set(RTEMS_IMPL_SRCLIST ../portable/os-impl-posix-gettime.c ../portable/os-impl-console-bsp.c - ../portable/os-impl-bsd-select.c ../portable/os-impl-posix-io.c ../portable/os-impl-posix-files.c ../portable/os-impl-posix-dirs.c @@ -61,11 +60,13 @@ if (OSAL_CONFIG_INCLUDE_NETWORK) list(APPEND RTEMS_IMPL_SRCLIST src/os-impl-network.c ../portable/os-impl-bsd-sockets.c + ../portable/os-impl-bsd-select.c ) else() list(APPEND RTEMS_IMPL_SRCLIST ../portable/os-impl-no-network.c ../portable/os-impl-no-sockets.c + ../portable/os-impl-no-select.c ) endif () From e0309a844de42204227e4176a6f0543325cfe2a7 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Wed, 18 May 2022 17:19:28 -0400 Subject: [PATCH 3/3] IC:Caelum-rc4+dev9, v6.0.0-rc4+dev74 - Update codeql workflows for reusable update - add os-impl-no-select.c for RTEMS - See and --- README.md | 8 +++++++- src/os/inc/osapi-version.h | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 34651c19a..e28af65db 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,12 @@ The autogenerated OSAL user's guide can be viewed at and + ### Development Build: v6.0.0-rc4+dev66 - Fix UtAssert_StringBufCompare SEGV when -1 for size passed in (on CentOS 7) @@ -284,7 +290,7 @@ the declarations, and generates a source file with stub definitions that rely on ### Development Build: v5.1.0-rc1+dev297 -- Fix #836, Add Testing Tools to the Security Policy +- Add Testing Tools to the Security Policy - See ### Development Build: v5.1.0-rc1+dev293 diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index da600b79a..3e20c0909 100644 --- a/src/os/inc/osapi-version.h +++ b/src/os/inc/osapi-version.h @@ -34,7 +34,7 @@ /* * Development Build Macro Definitions */ -#define OS_BUILD_NUMBER 66 +#define OS_BUILD_NUMBER 74 #define OS_BUILD_BASELINE "v6.0.0-rc4" /*