From dbfe429bad4d4b9ac8b689a8f2fdad8104baeed5 Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Tue, 14 Jan 2025 13:19:42 +0000 Subject: [PATCH] Remove sgxinfo.sh script --- .../setup_vm/roles/ccf_build/vars/clang15.yml | 1 - .../roles/ccf_install/tasks/deb_install.yml | 8 ---- .../roles/ccf_install/vars/common.yml | 2 +- samples/scripts/sgxinfo.sh | 38 ------------------- 4 files changed, 1 insertion(+), 48 deletions(-) delete mode 100755 samples/scripts/sgxinfo.sh diff --git a/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml b/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml index eac5cc863ca4..3de43ceb8061 100644 --- a/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml +++ b/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml @@ -17,7 +17,6 @@ debs: - expect - git - ccache - - kmod # modinfo for sgxinfo.sh - cmake - libssl-dev - libnghttp2-dev # experimental http2 support diff --git a/getting_started/setup_vm/roles/ccf_install/tasks/deb_install.yml b/getting_started/setup_vm/roles/ccf_install/tasks/deb_install.yml index 3a26f6df6331..09ee86df9245 100644 --- a/getting_started/setup_vm/roles/ccf_install/tasks/deb_install.yml +++ b/getting_started/setup_vm/roles/ccf_install/tasks/deb_install.yml @@ -33,14 +33,6 @@ become: true when: run_js|bool -- name: Copy JS generic (SGX) - copy: - src: "/opt/ccf_{{ platform }}/lib/{{ ccf_js_app_name }}.enclave.so.signed" - dest: "/usr/lib/ccf/{{ ccf_js_app_name }}.enclave.so.signed" - remote_src: true - become: true - when: (run_js|bool) and (platform == "sgx") - - name: Copy JS generic (Virtual) copy: src: "/opt/ccf_{{ platform }}/lib/{{ ccf_js_app_name }}.virtual.so" diff --git a/getting_started/setup_vm/roles/ccf_install/vars/common.yml b/getting_started/setup_vm/roles/ccf_install/vars/common.yml index d0d817fe0acb..490226cf6791 100644 --- a/getting_started/setup_vm/roles/ccf_install/vars/common.yml +++ b/getting_started/setup_vm/roles/ccf_install/vars/common.yml @@ -1,4 +1,4 @@ ccf_ver: "latest" run_js: false ccf_js_app_name: "libjs_generic" -platform: "sgx" +platform: "snp" diff --git a/samples/scripts/sgxinfo.sh b/samples/scripts/sgxinfo.sh deleted file mode 100755 index d3e274874c1b..000000000000 --- a/samples/scripts/sgxinfo.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the Apache 2.0 License. - -set +e - -if grep -q "^flags.*sgx.*" < /proc/cpuinfo ; then - echo "LINUX KERNEL WITH BUILT-IN SGX SUPPORT (5.11+):" - uname -r -else - # Pre 5.11 kernel - echo "DRIVER INFO:" - modinfo intel_sgx - echo "" - echo "" - echo "DRIVER LOADED:" - lsmod | grep intel_sgx || echo "Not loaded" -fi -echo "" -echo "" - -echo "AESM DAEMON:" -systemctl --no-pager status aesmd 2>/dev/null || echo "Not running" -echo "" -echo "" - -echo "PSW INFO:" -apt list --installed 2>/dev/null | grep libsgx -echo "" -echo "" - -echo "DCAP CLIENT INFO:" -apt list --installed 2>/dev/null | grep az-dcap -echo "" -echo "" - -echo "SGX INFO:" -/opt/openenclave/bin/oesgx \ No newline at end of file