From cad75f16ecb60fd3b3e2ff4da5a294c621929614 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Thu, 24 Mar 2022 16:07:20 -0400 Subject: [PATCH 1/4] nasa/osal#1234, Hotfix IC:Caleum-rc4+dev6 --- osal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osal b/osal index fafb045e7..128bc8ada 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit fafb045e7a5311e19affe0ddab724f1604e739f4 +Subproject commit 128bc8ada47ec4f1d9254166889ac502c95360b1 From 0b8d64bed24265a0261fb867565b66b69f45e995 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:13:02 -0400 Subject: [PATCH 2/4] nasa/cFE#2073, Resolve build failure for time cfg source Co-authored-by: Jacob Hageman --- cfe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfe b/cfe index a39b0a65f..830a73815 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit a39b0a65fb2724692469ff492484b523fb4fa7e6 +Subproject commit 830a738154647eed271d15097d83a3da7d1fb716 From 050b845d27ef7f106ea05aa981d8e74d8711a0e4 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 25 Mar 2022 15:07:34 -0400 Subject: [PATCH 3/4] nasa/osal#1238, avoid calling memchr() with unknown size buffer Co-authored-by: Joseph Hickey --- osal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osal b/osal index 128bc8ada..76c56bfeb 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 128bc8ada47ec4f1d9254166889ac502c95360b1 +Subproject commit 76c56bfebb82c8858ac4b530354a9c9612ad74d5 From e700f0c160f5ddb6cc750395d62e957202d54d1e Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 25 Mar 2022 17:16:08 -0400 Subject: [PATCH 4/4] IC:Caelum-rc4+dev7 **Combines** nasa/cFE#2074, v7.0.0-rc4+dev94 nasa/osal#1239, v6.0.0-rc4+dev66 nasa/psp#330, v1.6.0-rc4+dev21 nasa/ci_lab#107, v2.5.0-rc4+dev17 nasa/sample_app#171, v1.3.0-rc4+dev16 nasa/sample_lib#80, v1.3.0-rc4+dev16 nasa/to_lab#119, v2.5.0-rc4+dev16 nasa/sch_lab#112, v2.5.0-rc4+dev23 nasa/elf2cfetbl#108, v3.3.0-rc4+dev18 nasa/tblCRCTool#67, v1.3.0-rc4+dev14 nasa/cFS-GroundSystem#209, v3.0.0-rc4+dev19 **Includes** *Standardize Version Information* nasa/cFE#2071 nasa/osal#1240 nasa/psp#329 nasa/sample_app#170 nasa/sample_lib#79 nasa/ci_lab#108 nasa/to_lab#118 nasa/sch_lab#111 nasa/elf2cfetbl#107 nasa/tblCRCTool#66 nasa/cFS-GroundSystem#210 *Update Copyright Headers* nasa/cFE#2070 nasa/osal#1236 nasa/psp#328 nasa/sample_app#169 nasa/sample_lib#78 nasa/ci_lab#106 nasa/to_lab#117 nasa/sch_lab#110 nasa/elf2cfetbl#106 nasa/tblCRCTool#65 nasa/cFS-GroundSystem#208 Co-authored-by: Jacob Hageman --- apps/ci_lab | 2 +- apps/sample_app | 2 +- apps/sch_lab | 2 +- apps/to_lab | 2 +- cfe | 2 +- libs/sample_lib | 2 +- osal | 2 +- psp | 2 +- tools/cFS-GroundSystem | 2 +- tools/elf2cfetbl | 2 +- tools/tblCRCTool | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/ci_lab b/apps/ci_lab index 6c24068e5..54a7d411f 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit 6c24068e522da8db1655ce0244e8e5b09a6197e0 +Subproject commit 54a7d411fe8f42a0e43e8720317e4a42aff503db diff --git a/apps/sample_app b/apps/sample_app index 7edda31af..635b68bb1 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 7edda31affdcd70f438717d89b26115447de78f3 +Subproject commit 635b68bb180295e1d9feb26364efbcc8c43b5672 diff --git a/apps/sch_lab b/apps/sch_lab index 954f9ba72..d15cf118a 160000 --- a/apps/sch_lab +++ b/apps/sch_lab @@ -1 +1 @@ -Subproject commit 954f9ba7235df37e53d829e0d6fe5ea0206b9a56 +Subproject commit d15cf118abc18b36cabcb6c690e044dce73684f9 diff --git a/apps/to_lab b/apps/to_lab index 5909691a3..d24933f4b 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit 5909691a3361d2e06a0a056b1bfefb51c1b880f0 +Subproject commit d24933f4bb8ba26c2768b8d5d53f1e1635e2a600 diff --git a/cfe b/cfe index 830a73815..a6c6b65a4 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 830a738154647eed271d15097d83a3da7d1fb716 +Subproject commit a6c6b65a43fceb623bbac5bfc305c68b03317982 diff --git a/libs/sample_lib b/libs/sample_lib index 7b00e67e2..390f76585 160000 --- a/libs/sample_lib +++ b/libs/sample_lib @@ -1 +1 @@ -Subproject commit 7b00e67e24e783f4460a354fefa198da338f29a1 +Subproject commit 390f76585db46b75931c0da7f2eea97a8490c11b diff --git a/osal b/osal index 76c56bfeb..88f72d788 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 76c56bfebb82c8858ac4b530354a9c9612ad74d5 +Subproject commit 88f72d788d33a12e7bf9d9f01c77346438730ffa diff --git a/psp b/psp index 609e0762c..e3d28d85a 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit 609e0762c61a0b80b1428eb5d4f233f0f73c7554 +Subproject commit e3d28d85a49c849c79f83e7414be65a318a8f834 diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index b0faa754a..4fd55e2af 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit b0faa754a62479dc9e97ffc7d389153ce9dd9e68 +Subproject commit 4fd55e2af96f3ad8f8b2165c53b4fc4bf8e80d8e diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl index 71ea2848f..51fbe3568 160000 --- a/tools/elf2cfetbl +++ b/tools/elf2cfetbl @@ -1 +1 @@ -Subproject commit 71ea2848f4b93e37a66143c1d58ad17ae9fe6708 +Subproject commit 51fbe3568f51373aa28b00abbf341146610c362b diff --git a/tools/tblCRCTool b/tools/tblCRCTool index 7cfd41149..57da3a51e 160000 --- a/tools/tblCRCTool +++ b/tools/tblCRCTool @@ -1 +1 @@ -Subproject commit 7cfd41149a489de7bfa09a9b7d0fb80b95986370 +Subproject commit 57da3a51ea3f6f48d92c1a087751b6b598521158