Merge pull request #411 from nasa/integration-candidate

PSP Integration candidate: Caelum-rc4+dev57
nasa · Sep 1, 2023 · 40d5035 · 40d5035
2 parents a5386f8 + 87b063b
commit 40d5035
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 19 deletions.
diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml
@@ -15,19 +15,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Dependencies
-        run: sudo apt update
-        run: sudo apt install -y w3m
+        run: |
+          sudo apt update
+          sudo apt install -y w3m
       - name: Checkout IC Branch
         uses: actions/checkout@v3
         with:
           fetch-depth: '0'
           ref: main
       - name: Rebase IC Branch
-        run: git config user.name "GitHub Actions"
-        run: git config user.email "[email protected]"
-        run: git pull
-        run: git checkout integration-candidate
-        run: git rebase main
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "[email protected]"
+          git pull
+          git checkout integration-candidate
+          git rebase main
       - name: Merge each PR
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -59,21 +61,21 @@ jobs:
           sed -ir "s|# Changelog|$changelog_entry|" CHANGELOG.md
           
           buildnumber_entry=$'#define CFE_PSP_IMPL_BUILD_NUMBER   '${rev_num}
-          sed -ir "s|define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/mcp750-vxworks/inc/psp_version.h
+          sed -ir "s|#define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/mcp750-vxworks/inc/psp_version.h
           
           buildnumber_entry=$'#define CFE_PSP_IMPL_BUILD_NUMBER   '${rev_num}
-          sed -ir "s|define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/pc-linux/inc/psp_version.h
+          sed -ir "s|#define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/pc-linux/inc/psp_version.h
           
           buildnumber_entry=$'#define CFE_PSP_IMPL_BUILD_NUMBER   '${rev_num}
-          sed -ir "s|define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/pc-rtems/inc/psp_version.h
+          sed -ir "s|#define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/pc-rtems/inc/psp_version.h
       - name: Commit and Push Updates to IC Branch
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: git add CHANGELOG.md
-        run: git add fsw/mcp750-vxworks/inc/psp_version.h
-        run: git add fsw/pc-linux/inc/psp_version.h
-        run: git add fsw/pc-rtems/inc/psp_version.h
         run: |
           rev_num=$(git rev-list v1.6.0-rc4.. --count)
+          git add CHANGELOG.md
+          git add fsw/mcp750-vxworks/inc/psp_version.h
+          git add fsw/pc-linux/inc/psp_version.h
+          git add fsw/pc-rtems/inc/psp_version.h
           git commit -m "Updating documentation and version numbers for v1.6.0-rc4+dev${rev_num}"
-        run: git push -v origin integration-candidate
+          git push -v origin integration-candidate
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: v1.6.0-rc4+dev90
+- RTEMS.cmake: add quotes around ${RTEMS_BSP_C_FLAGS}.
+- Fixes errors in IC Bundle workflow file
+- See <https://github.com/nasa/PSP/pull/395> and <https://github.com/nasa/PSP/pull/400>
+
 ## Development Build: v1.6.0-rc4+dev82
 - Implement RTEMS Sysmons
 - find psp standard module

diff --git a/cmake/Modules/Platform/RTEMS.cmake b/cmake/Modules/Platform/RTEMS.cmake
@@ -67,7 +67,7 @@ else()
    # Then run "rtems-syms" and re-link the output into a final executable
    set(CMAKE_C_LINK_EXECUTABLE
        "<CMAKE_C_COMPILER> ${RTEMS_SYS_SPECS_FLAGS} ${RTEMS_BSP_C_FLAGS} <FLAGS> ${RTEMS_SYS_LINKFLAGS} -o <TARGET>-prelink <OBJECTS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>"
-       "${RTEMS_TOOLS_PREFIX}/bin/rtems-syms -v -e -c ${RTEMS_BSP_C_FLAGS} -C <CMAKE_C_COMPILER> -o <TARGET>-dl-sym.o <TARGET>-prelink"
+       "${RTEMS_TOOLS_PREFIX}/bin/rtems-syms -v -e -c \"${RTEMS_BSP_C_FLAGS}\" -C <CMAKE_C_COMPILER> -o <TARGET>-dl-sym.o <TARGET>-prelink"
        "<CMAKE_C_COMPILER> ${RTEMS_SYS_SPECS_FLAGS} ${RTEMS_BSP_C_FLAGS} <FLAGS> ${RTEMS_SYS_LINKFLAGS} -o <TARGET> <TARGET>-dl-sym.o <OBJECTS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>")
 endif(RTEMS_DYNAMIC_LOAD)
 

diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h
@@ -27,7 +27,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   82
+#define CFE_PSP_IMPL_BUILD_NUMBER   90
 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
 
 /*

diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h
@@ -27,7 +27,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   82
+#define CFE_PSP_IMPL_BUILD_NUMBER   90
 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
 
 /*

diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h
@@ -27,7 +27,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   82
+#define CFE_PSP_IMPL_BUILD_NUMBER   90
 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
 
 /*