From 4e9e0308739cd1be22561974cb55a254d1779af7 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Mon, 27 Apr 2020 17:51:12 -0400 Subject: [PATCH 01/10] Fix #72, LGTM now OMIT_DEPRECATED build --- .lgtm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.lgtm.yml b/.lgtm.yml index 6702cc000..d794485f8 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -15,6 +15,6 @@ extraction: build_command: - "cp cfe/cmake/Makefile.sample Makefile" - "cp -r cfe/cmake/sample_defs sample_defs" - - "make prep" + - "make OMIT_DEPRECATED=true prep" - "make" From 3918fd42ae7a7ba3cd76b6f9923c0b85692fe0c2 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Tue, 5 May 2020 12:01:44 -0400 Subject: [PATCH 02/10] Fix #79, Add sleep after script to avoid truncated log --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index b26d616a7..6db19b4e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -124,3 +124,7 @@ script: grep -i 'warn\|err\|fail' cFS_startup.txt exit -1 fi + +# After script sleep avoids Job log truncation +after_script: + - sleep 1 From e88592fc553af7b5076b50f85fc1c118807146b5 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Fri, 8 May 2020 15:52:37 -0400 Subject: [PATCH 03/10] First update for Integration Candidate: 2020-04-29 --- apps/ci_lab | 2 +- apps/sample_app | 2 +- apps/sch_lab | 2 +- apps/to_lab | 2 +- cfe | 2 +- osal | 2 +- psp | 2 +- tools/cFS-GroundSystem | 2 +- tools/elf2cfetbl | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/ci_lab b/apps/ci_lab index fe9e3ef36..c4ec2a728 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit fe9e3ef369fa35fd00c2ae109693282167d0747c +Subproject commit c4ec2a728a825d5d5119c95c7bff1a6ac3c0abce diff --git a/apps/sample_app b/apps/sample_app index af9b210e6..8a77aa7b3 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit af9b210e6c47de576f710e161c0ff98b262be1a3 +Subproject commit 8a77aa7b3e896fd56085d5a1555e0212986e8cf1 diff --git a/apps/sch_lab b/apps/sch_lab index bc82c4c98..c120d8a22 160000 --- a/apps/sch_lab +++ b/apps/sch_lab @@ -1 +1 @@ -Subproject commit bc82c4c98a47edeb7265c9a95631f4da590900fb +Subproject commit c120d8a220147d0a7822c20fc4ededc31687b957 diff --git a/apps/to_lab b/apps/to_lab index 545710c3e..e3c530cab 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit 545710c3eb9c3b63821b7cc41489f69da2bb2c30 +Subproject commit e3c530cabc09325eae3e082520ab3e44670c617d diff --git a/cfe b/cfe index d9730b574..4c392ccfc 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit d9730b5745e0068c06c5771727f0080b00e0d588 +Subproject commit 4c392ccfcae0203a093d8bb9ccdadd754015c201 diff --git a/osal b/osal index e1f7a528d..5f76a91ab 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit e1f7a528d872b10bd67af706eae9bc068c673e36 +Subproject commit 5f76a91ab4d9de250f11e30f75298b67023b931e diff --git a/psp b/psp index 09b62df52..d1872ed25 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit 09b62df52baec664340057c727f4290f3b776f2a +Subproject commit d1872ed255a2f9ef29b144edeaf07d40229b3bec diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 65aac1416..8cd7b0ebe 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 65aac14165decdf20004756f3f7f401187890b12 +Subproject commit 8cd7b0ebe5bd16c8e4137a20b52bd2ff56ffb739 diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl index f9741ed9f..08e0611b4 160000 --- a/tools/elf2cfetbl +++ b/tools/elf2cfetbl @@ -1 +1 @@ -Subproject commit f9741ed9f356bec56e56367753af358dbd4b5b92 +Subproject commit 08e0611b4fb5a6af63262fcbaead74013ae71170 From 3faa89e8e761487361d4c4dc62ffb04a5f4e5df4 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Fri, 8 May 2020 17:14:53 -0400 Subject: [PATCH 04/10] Updated cfe, osal, and psp based on resolved conflicts in parent repos --- cfe | 2 +- osal | 2 +- psp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfe b/cfe index 4c392ccfc..e79d2a79c 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 4c392ccfcae0203a093d8bb9ccdadd754015c201 +Subproject commit e79d2a79c60a5cff9af4cdcf1158fc41e7072b55 diff --git a/osal b/osal index 5f76a91ab..998377b93 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 5f76a91ab4d9de250f11e30f75298b67023b931e +Subproject commit 998377b93ed67dc409ac82162c54946b776e4d74 diff --git a/psp b/psp index d1872ed25..e6e247ab6 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit d1872ed255a2f9ef29b144edeaf07d40229b3bec +Subproject commit e6e247ab62df83de286f85153fae92f7610d7fff From 4cf2969d036ad9fc9bf7246560442be87fffbc09 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Mon, 11 May 2020 08:55:56 -0400 Subject: [PATCH 05/10] Update cFE with fs_UT fix --- cfe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfe b/cfe index e79d2a79c..7b56b857a 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit e79d2a79c60a5cff9af4cdcf1158fc41e7072b55 +Subproject commit 7b56b857afa7af59e8e1baa62d055d4b0ee89664 From d30f12ed423f89eb906d04db6587cee11c0ea703 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Mon, 11 May 2020 11:35:33 -0400 Subject: [PATCH 06/10] Updated OSAL to latest IC --- osal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osal b/osal index 998377b93..c1555b814 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 998377b93ed67dc409ac82162c54946b776e4d74 +Subproject commit c1555b814a085c8a46f2e83fac2167c21d0535e5 From fb8f91e046fcb10d57fe3cbdb681343c42489f71 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Mon, 11 May 2020 12:52:03 -0400 Subject: [PATCH 07/10] Update SAMPLE_APP and CFE to include UT fixes --- apps/sample_app | 2 +- cfe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/sample_app b/apps/sample_app index 8a77aa7b3..155a3e705 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 8a77aa7b3e896fd56085d5a1555e0212986e8cf1 +Subproject commit 155a3e70596c59d09d334c63990dbdf930d588d8 diff --git a/cfe b/cfe index 7b56b857a..6f06b1619 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 7b56b857afa7af59e8e1baa62d055d4b0ee89664 +Subproject commit 6f06b1619648d1bd137be158aba8e25f8d396fae From 5032e7c76bf92ed6988a696d30fc5d628ab502c5 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Mon, 11 May 2020 14:24:35 -0400 Subject: [PATCH 08/10] Update TO_LAB with pull #29 Manual merge was required to resolve conflict --- apps/to_lab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/to_lab b/apps/to_lab index e3c530cab..9793ba8f2 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit e3c530cabc09325eae3e082520ab3e44670c617d +Subproject commit 9793ba8f2d8b69cf6e2e9b2c05ac01c338f62bd4 From 2cbccac87655f70ba6372234008bfde0e2ab2d6a Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Wed, 13 May 2020 11:15:14 -0400 Subject: [PATCH 09/10] Set all submodules to master --- apps/ci_lab | 2 +- apps/sample_app | 2 +- apps/sch_lab | 2 +- apps/to_lab | 2 +- cfe | 2 +- osal | 2 +- psp | 2 +- tools/cFS-GroundSystem | 2 +- tools/elf2cfetbl | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/ci_lab b/apps/ci_lab index c4ec2a728..a5891633b 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit c4ec2a728a825d5d5119c95c7bff1a6ac3c0abce +Subproject commit a5891633bd95edaf3314b98cbab38b1426fd6873 diff --git a/apps/sample_app b/apps/sample_app index 155a3e705..4b6d54ff6 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 155a3e70596c59d09d334c63990dbdf930d588d8 +Subproject commit 4b6d54ff6216cc8dd6cceab1dbcd1db21f456f69 diff --git a/apps/sch_lab b/apps/sch_lab index c120d8a22..27a2bd71f 160000 --- a/apps/sch_lab +++ b/apps/sch_lab @@ -1 +1 @@ -Subproject commit c120d8a220147d0a7822c20fc4ededc31687b957 +Subproject commit 27a2bd71fcc3b21eeb17d88cc1524d1a792ec5da diff --git a/apps/to_lab b/apps/to_lab index 9793ba8f2..b59f32e9d 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit 9793ba8f2d8b69cf6e2e9b2c05ac01c338f62bd4 +Subproject commit b59f32e9d2510be74e3f0eefa4168ba27cb88750 diff --git a/cfe b/cfe index 6f06b1619..95f34d25c 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 6f06b1619648d1bd137be158aba8e25f8d396fae +Subproject commit 95f34d25cb2843b8ba9db6338bb0b53cb3e38f92 diff --git a/osal b/osal index c1555b814..5f76a91ab 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit c1555b814a085c8a46f2e83fac2167c21d0535e5 +Subproject commit 5f76a91ab4d9de250f11e30f75298b67023b931e diff --git a/psp b/psp index e6e247ab6..37ee8eb2d 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit e6e247ab62df83de286f85153fae92f7610d7fff +Subproject commit 37ee8eb2d7ce006dc1570b920ae75a7ac5f89d27 diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 8cd7b0ebe..1c31f94f3 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 8cd7b0ebe5bd16c8e4137a20b52bd2ff56ffb739 +Subproject commit 1c31f94f3b63d3ff9c5da35ca9f8825a89ef3258 diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl index 08e0611b4..8e54e26f2 160000 --- a/tools/elf2cfetbl +++ b/tools/elf2cfetbl @@ -1 +1 @@ -Subproject commit 08e0611b4fb5a6af63262fcbaead74013ae71170 +Subproject commit 8e54e26f24419e0218587574ec717106937e59fe From f3de263f1d06f12278f0b20ace43f98fdf6ba11e Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Wed, 13 May 2020 11:50:49 -0400 Subject: [PATCH 10/10] Update osal to 5.0.16 --- osal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osal b/osal index 5f76a91ab..c2bcebbc4 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 5f76a91ab4d9de250f11e30f75298b67023b931e +Subproject commit c2bcebbc4d7e60a41b604e9acfc8af3c60b8536a