From 39c6cf72adcbb29370350e09b0d269ab59cb8ddb Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Tue, 21 Apr 2020 18:30:35 -0400 Subject: [PATCH 1/7] Switch to integration candidate 2020-04-15 for cfe, osal, psp, and cFS-GroundSystem --- cfe | 2 +- osal | 2 +- psp | 2 +- tools/cFS-GroundSystem | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cfe b/cfe index 0648a47bf..d9ade13cb 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 0648a47bf4369138c31f9019458ab2eceec738a8 +Subproject commit d9ade13cbd1a5a7de7ed945b55d28b282b651085 diff --git a/osal b/osal index a66eb2dc0..195beb46d 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit a66eb2dc00136a77779414452835bb6364d5e1fb +Subproject commit 195beb46d93b35350660ee619e0198c9aae3ff8d diff --git a/psp b/psp index 27063c009..ab38fe699 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit 27063c0098ae5167bfcf49424ad2be85ff0e6b9e +Subproject commit ab38fe699322eeb036bbbdc38a27f42644bd9db6 diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 9d4b1557d..7dd9675ad 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 9d4b1557d2ddd54be5bcf404a575f265d91cea49 +Subproject commit 7dd9675ad6c994bec412e3b3f01927cd2b220abf From 6f6883a12ec8b8063d25876ff83bddad872c28cb Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Thu, 23 Apr 2020 18:37:55 -0400 Subject: [PATCH 2/7] Update cfe, osal and cFS-GroundSystem --- cfe | 2 +- osal | 2 +- tools/cFS-GroundSystem | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfe b/cfe index d9ade13cb..3b7f20fbd 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit d9ade13cbd1a5a7de7ed945b55d28b282b651085 +Subproject commit 3b7f20fbd67387cc74702a66d0fd0ba53a7ecaff diff --git a/osal b/osal index 195beb46d..9ffab3582 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 195beb46d93b35350660ee619e0198c9aae3ff8d +Subproject commit 9ffab358221d86b4a1072616a142b177f408cf1c diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 7dd9675ad..3ed7b7485 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 7dd9675ad6c994bec412e3b3f01927cd2b220abf +Subproject commit 3ed7b748523902a1d393a32ce18223b7b7963ffa From 430b93f9221e862be2ec9537536abc840794fc1a Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Fri, 24 Apr 2020 12:36:47 -0400 Subject: [PATCH 3/7] Update cfe and osal to fix build system OSTYPE/BSPTYPE problem --- cfe | 2 +- osal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfe b/cfe index 3b7f20fbd..89308e414 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 3b7f20fbd67387cc74702a66d0fd0ba53a7ecaff +Subproject commit 89308e4149fe661dff0d693e05bb94c655a10c05 diff --git a/osal b/osal index 9ffab3582..ea042c90a 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 9ffab358221d86b4a1072616a142b177f408cf1c +Subproject commit ea042c90a2265ba1b9a0913c2e47cf9e05f80546 From 451c917eb2ec855df0baef9ec7dbedc2f63c2497 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Mon, 27 Apr 2020 13:20:29 -0400 Subject: [PATCH 4/7] Update CFE to fix omit deprecated build --- cfe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfe b/cfe index 89308e414..fb88b5314 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 89308e4149fe661dff0d693e05bb94c655a10c05 +Subproject commit fb88b531404e944766cf7a6ed4eca3c63ac3a634 From e11b263c9d689e17de2099e93089b0f7bc636a75 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Mon, 27 Apr 2020 14:23:59 -0400 Subject: [PATCH 5/7] Update cfe submodule to fix MAX_API error --- cfe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfe b/cfe index fb88b5314..690576a66 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit fb88b531404e944766cf7a6ed4eca3c63ac3a634 +Subproject commit 690576a669f0eb561eb21894e973ea3a7fc7b7cd From b5353d3469926eada147df306125d272518a2131 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Mon, 27 Apr 2020 18:08:31 -0400 Subject: [PATCH 6/7] Add sample_lib updates. Update to latest cfe, osal, psp, and groundsystem submodules --- apps/sample_lib | 2 +- cfe | 2 +- osal | 2 +- psp | 2 +- tools/cFS-GroundSystem | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/sample_lib b/apps/sample_lib index 33efec32e..a561fbf29 160000 --- a/apps/sample_lib +++ b/apps/sample_lib @@ -1 +1 @@ -Subproject commit 33efec32e23fdee3e4a373de7e61bc812173e411 +Subproject commit a561fbf295bfc2d5aa9abec7d69aaa7bc1855606 diff --git a/cfe b/cfe index 690576a66..963ba099d 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 690576a669f0eb561eb21894e973ea3a7fc7b7cd +Subproject commit 963ba099d177aec63afb7c27e9d17446f50f0088 diff --git a/osal b/osal index ea042c90a..1b368161f 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit ea042c90a2265ba1b9a0913c2e47cf9e05f80546 +Subproject commit 1b368161fca659f6266ca2df62e9eb8c468de231 diff --git a/psp b/psp index ab38fe699..ae7722d5a 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit ab38fe699322eeb036bbbdc38a27f42644bd9db6 +Subproject commit ae7722d5a44546120601ace27b88b0ee883cc11c diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 3ed7b7485..11aa2cb51 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 3ed7b748523902a1d393a32ce18223b7b7963ffa +Subproject commit 11aa2cb513a8663a8f4220ba40b0af990b0a491b From 69128b94379a262d930f45238347a4cdb4a6b0f6 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Mon, 27 Apr 2020 18:34:15 -0400 Subject: [PATCH 7/7] Update submodules to master for Integration Candidate: 2020-04-15 --- apps/sample_app | 2 +- apps/sample_lib | 2 +- cfe | 2 +- osal | 2 +- psp | 2 +- tools/cFS-GroundSystem | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/sample_app b/apps/sample_app index b95629216..1e33c1901 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit b95629216ae8cda3b86332f81bb515743fedcede +Subproject commit 1e33c190157a9d9efd7bb453c16bbe9087b37ddc diff --git a/apps/sample_lib b/apps/sample_lib index a561fbf29..8be6f92f7 160000 --- a/apps/sample_lib +++ b/apps/sample_lib @@ -1 +1 @@ -Subproject commit a561fbf295bfc2d5aa9abec7d69aaa7bc1855606 +Subproject commit 8be6f92f7c1c3a057b260e6313266d4bbcf81279 diff --git a/cfe b/cfe index 963ba099d..3c616f2b8 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 963ba099d177aec63afb7c27e9d17446f50f0088 +Subproject commit 3c616f2b88f515a33edf9f848309858b0ed0637c diff --git a/osal b/osal index 1b368161f..b27c73b59 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 1b368161fca659f6266ca2df62e9eb8c468de231 +Subproject commit b27c73b592543bedddcb6891890f47074d5f27ca diff --git a/psp b/psp index ae7722d5a..09b62df52 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit ae7722d5a44546120601ace27b88b0ee883cc11c +Subproject commit 09b62df52baec664340057c727f4290f3b776f2a diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 11aa2cb51..65aac1416 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 11aa2cb513a8663a8f4220ba40b0af990b0a491b +Subproject commit 65aac14165decdf20004756f3f7f401187890b12