Skip to content

Commit

Permalink
Drop support for out-of-tree DCAP SGX drivers
Browse files Browse the repository at this point in the history
The out-of-tree DCAP drivers have the same userspace interface as the
upstream driver, so we can re-use the flow for upstream one.

Signed-off-by: Dmitrii Kuvaiskii <dmitrii.kuvaiskii@intel.com>
  • Loading branch information
dimakuv committed Nov 2, 2022
1 parent 7d5ca56 commit 0b60fa2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
16 changes: 8 additions & 8 deletions config.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ Gramine:
# Specify the Intel SGX driver installed on your machine (more specifically, on the machine where
# the graminized Docker container will run); there are several variants of the SGX driver:
#
# - legacy out-of-tree driver: use something like the below values, but adjust the branch name
# Repository: "https://github.com/01org/linux-sgx-driver.git"
# Branch: "sgx_driver_1.9"
#
# - DCAP out-of-tree driver: use something like the below values
# Repository: "https://github.com/intel/SGXDataCenterAttestationPrimitives.git"
# Branch: "DCAP_1.11 && cp -r driver/linux/* ."
# - upstream (in-kernel) driver: use empty values like below
# Repository: ""
# Branch: ""
#
# - DCAP in-kernel driver: use empty values like below
# - DCAP out-of-tree driver: same as above, use empty values
# Repository: ""
# Branch: ""
#
# - legacy out-of-tree driver: use something like the below values, but adjust the branch name
# Repository: "https://github.com/01org/linux-sgx-driver.git"
# Branch: "sgx_driver_1.9"
#
SGXDriver:
Repository: ""
Branch: ""
6 changes: 2 additions & 4 deletions templates/Dockerfile.common.compile.template
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN cd /gramine \
&& git fetch origin {{Gramine.Branch}} \
&& git checkout {{Gramine.Branch}}

{% if SGXDriver.Repository %}
{% if "linux-sgx-driver" in SGXDriver.Repository %}
RUN cd /gramine \
&& git clone {{SGXDriver.Repository}} driver \
&& cd driver \
Expand All @@ -31,9 +31,7 @@ RUN cd /gramine \
--buildtype={% if debug %}debug{% else %}release{% endif %} \
-Ddirect=enabled -Dsgx=enabled \
{% if Distro.startswith('ubuntu') %}-Ddcap=enabled{% endif %} \
{% if "SGXDataCenterAttestationPrimitives" in SGXDriver.Repository %} \
-Dsgx_driver=dcap1.10 -Dsgx_driver_include_path=/gramine/driver/driver/linux/include \
{% elif "linux-sgx-driver" in SGXDriver.Repository %} \
{% if "linux-sgx-driver" in SGXDriver.Repository %} \
-Dsgx_driver=oot -Dsgx_driver_include_path=/gramine/driver \
{% else %} \
-Dsgx_driver=upstream -Dsgx_driver_include_path=/gramine/driver \
Expand Down

0 comments on commit 0b60fa2

Please sign in to comment.