Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to SGX SDK v1.1.0 #184

Merged
merged 4 commits into from Dec 19, 2019
Merged

Upgrade to SGX SDK v1.1.0 #184

merged 4 commits into from Dec 19, 2019

Conversation

@dingelish
Copy link
Contributor

dingelish commented Dec 19, 2019

Description

This PR is to upgrade teaclave-sgx-sdk v1.1.0 and Intel SGX SDK 2.7.1. Everything is fixed and test passed on my workstation.

Fixes # (issue)

Type of change (select applied and DELETE the others)

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • API change with a documentation update
  • Additional test coverage
  • Code cleanup or just sync with upstream third-party crates

How Has This Been Tested?

make sgx-test passed. CI will soon pass at https://ci.mesalock-linux.org/dingelish/incubator-mesatee/36

Checklist (check ALL before submitting PR, even not applicable)

  • Fork the repo and create your branch from master.
  • If you've added code that should be tested, add tests.
  • If you've changed APIs, update the documentation.
  • Ensure the tests pass (see CI results).
  • Make sure your code lints/format.
@dingelish dingelish requested a review from mssun Dec 19, 2019
@dingelish

This comment has been minimized.

Copy link
Contributor Author

dingelish commented Dec 19, 2019

@mssun

This comment has been minimized.

Copy link
Member

mssun commented Dec 19, 2019

BTW, can you fix this bug in this PR? #153

This may cause some issues for submodule updates.

@dingelish

This comment has been minimized.

Copy link
Contributor Author

dingelish commented Dec 19, 2019

let me try

dingelish added 3 commits Dec 19, 2019
@dingelish

This comment has been minimized.

Copy link
Contributor Author

dingelish commented Dec 19, 2019

The fix is to check:

  1. if any of the submodule is empty
  2. git submodule summary's output is not empty

if either (1) or (2) is satisfied, do submodule update

diff --git a/cmake/MesaTEEUtils.cmake b/cmake/MesaTEEUtils.cmake
index 8c2f0cd..709937f 100644
--- a/cmake/MesaTEEUtils.cmake
+++ b/cmake/MesaTEEUtils.cmake
@@ -20,7 +20,7 @@ endfunction()

 function(init_submodules)
     execute_process (
-    COMMAND bash -c "if git submodule status | egrep -q '^[-]|^[+]'; then echo 'INFO: Need to reinitialize git submodules' && git submodule update --init --recursive; fi"
+    COMMAND bash -c "if [[ ! $(git submodule foreach ls -A) ]] || [[ $(git submodule summary) ]]; then echo INFO: Need to reinitialize git submodules && git submodule update --init --recursive; fi"
     )
 endfunction()
@dingelish

This comment has been minimized.

Copy link
Contributor Author

dingelish commented Dec 19, 2019

@mssun
mssun approved these changes Dec 19, 2019
@mssun mssun merged commit 7d27eec into apache:master Dec 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.