Skip to content

Commit 608fe1d

Browse files
committed
Linux 2.12 Open Source Gold Release
Added Ubuntu 20.04 and CentOS 8.2 support. Added Intel(R) Provisioning Certification Service V3 API support for ECDSA attestation. Fixed bugs. Signed-off-by: Li, Xun <[email protected]>
1 parent 9671c99 commit 608fe1d

File tree

45 files changed

+677
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+677
-124
lines changed

Makefile

+14-4
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,13 @@ deb_libsgx_enclave_common: psw
137137
deb_libsgx_urts: psw
138138
./linux/installer/deb/libsgx-urts/build.sh
139139

140+
.PHONY: deb_libsgx_headers_pkg
141+
deb_libsgx_headers_pkg:
142+
./linux/installer/deb/libsgx-headers/build.sh
143+
140144
ifeq ($(CC_BELOW_5_2), 1)
141145
.PHONY: deb_psw_pkg
142-
deb_psw_pkg: deb_libsgx_qe3_logic deb_libsgx_pce_logic deb_sgx_aesm_service deb_libsgx_epid deb_libsgx_launch deb_libsgx_quote_ex deb_libsgx_uae_service deb_libsgx_enclave_common deb_libsgx_urts deb_libsgx_ae_qe3
146+
deb_psw_pkg: deb_libsgx_headers_pkg deb_libsgx_qe3_logic deb_libsgx_pce_logic deb_sgx_aesm_service deb_libsgx_epid deb_libsgx_launch deb_libsgx_quote_ex deb_libsgx_uae_service deb_libsgx_enclave_common deb_libsgx_urts deb_libsgx_ae_qe3
143147
else
144148
.PHONY: deb_libsgx_dcap_default_qpl
145149
deb_libsgx_dcap_default_qpl:
@@ -183,7 +187,7 @@ deb_sgx_ra_service_pkg:
183187

184188

185189
.PHONY: deb_psw_pkg
186-
deb_psw_pkg: deb_libsgx_qe3_logic deb_libsgx_pce_logic deb_sgx_aesm_service deb_libsgx_epid deb_libsgx_launch deb_libsgx_quote_ex deb_libsgx_uae_service deb_libsgx_enclave_common deb_libsgx_urts deb_libsgx_ae_qe3 deb_libsgx_dcap_default_qpl deb_libsgx_dcap_pccs deb_libsgx_dcap_ql deb_libsgx_ae_qve deb_sgx_dcap_quote_verify deb_sgx_pck_id_retrieval_tool_pkg deb_sgx_ra_service_pkg
190+
deb_psw_pkg: deb_libsgx_headers_pkg deb_libsgx_qe3_logic deb_libsgx_pce_logic deb_sgx_aesm_service deb_libsgx_epid deb_libsgx_launch deb_libsgx_quote_ex deb_libsgx_uae_service deb_libsgx_enclave_common deb_libsgx_urts deb_libsgx_ae_qe3 deb_libsgx_dcap_default_qpl deb_libsgx_dcap_pccs deb_libsgx_dcap_ql deb_libsgx_ae_qve deb_sgx_dcap_quote_verify deb_sgx_pck_id_retrieval_tool_pkg deb_sgx_ra_service_pkg
187191
endif
188192

189193
.PHONY: deb_local_repo
@@ -238,9 +242,13 @@ rpm_libsgx_urts: psw
238242
rpm_sdk_pkg: sdk
239243
./linux/installer/rpm/sdk/build.sh
240244

245+
.PHONY: rpm_libsgx_headers_pkg
246+
rpm_libsgx_headers_pkg:
247+
./linux/installer/rpm/libsgx-headers/build.sh
248+
241249
ifeq ($(CC_BELOW_5_2), 1)
242250
.PHONY: rpm_psw_pkg
243-
rpm_psw_pkg: rpm_libsgx_pce_logic rpm_libsgx_qe3_logic rpm_sgx_aesm_service rpm_libsgx_epid rpm_libsgx_launch rpm_libsgx_quote_ex rpm_libsgx_uae_service rpm_libsgx_enclave_common rpm_libsgx_urts rpm_libsgx_ae_qe3
251+
rpm_psw_pkg: rpm_libsgx_headers_pkg rpm_libsgx_pce_logic rpm_libsgx_qe3_logic rpm_sgx_aesm_service rpm_libsgx_epid rpm_libsgx_launch rpm_libsgx_quote_ex rpm_libsgx_uae_service rpm_libsgx_enclave_common rpm_libsgx_urts rpm_libsgx_ae_qe3
244252
else
245253
.PHONY: rpm_libsgx_dcap_default_qpl
246254
rpm_libsgx_dcap_default_qpl:
@@ -282,7 +290,7 @@ rpm_sgx_ra_service_pkg:
282290
$(CP) external/dcap_source/tools/SGXPlatformRegistration/build/installer/libsgx-ra-*rpm ./linux/installer/rpm/sgx-aesm-service/
283291

284292
.PHONY: rpm_psw_pkg
285-
rpm_psw_pkg: rpm_libsgx_pce_logic rpm_libsgx_qe3_logic rpm_sgx_aesm_service rpm_libsgx_epid rpm_libsgx_launch rpm_libsgx_quote_ex rpm_libsgx_uae_service rpm_libsgx_enclave_common rpm_libsgx_urts rpm_libsgx_ae_qe3 rpm_libsgx_dcap_default_qpl rpm_libsgx_dcap_pccs rpm_libsgx_dcap_ql rpm_libsgx_ae_qve rpm_sgx_dcap_quote_verify rpm_sgx_pck_id_retrieval_tool_pkg rpm_sgx_ra_service_pkg
293+
rpm_psw_pkg: rpm_libsgx_headers_pkg rpm_libsgx_pce_logic rpm_libsgx_qe3_logic rpm_sgx_aesm_service rpm_libsgx_epid rpm_libsgx_launch rpm_libsgx_quote_ex rpm_libsgx_uae_service rpm_libsgx_enclave_common rpm_libsgx_urts rpm_libsgx_ae_qe3 rpm_libsgx_dcap_default_qpl rpm_libsgx_dcap_pccs rpm_libsgx_dcap_ql rpm_libsgx_ae_qve rpm_sgx_dcap_quote_verify rpm_sgx_pck_id_retrieval_tool_pkg rpm_sgx_ra_service_pkg
286294
endif
287295

288296
.PHONY: rpm_local_repo
@@ -304,6 +312,7 @@ clean:
304312
./linux/installer/deb/libsgx-uae-service/clean.sh
305313
./linux/installer/deb/libsgx-enclave-common/clean.sh
306314
./linux/installer/deb/libsgx-urts/clean.sh
315+
./linux/installer/deb/libsgx-headers/clean.sh
307316
./linux/installer/common/local_repo_builder/local_repo_builder.sh debian clean
308317
./linux/installer/rpm/sgx-aesm-service/clean.sh
309318
./linux/installer/rpm/libsgx-epid/clean.sh
@@ -312,6 +321,7 @@ clean:
312321
./linux/installer/rpm/libsgx-uae-service/clean.sh
313322
./linux/installer/rpm/libsgx-enclave-common/clean.sh
314323
./linux/installer/rpm/libsgx-urts/clean.sh
324+
./linux/installer/rpm/libsgx-headers/clean.sh
315325
./linux/installer/rpm/sdk/clean.sh
316326
./linux/installer/common/local_repo_builder/local_repo_builder.sh rpm clean
317327
ifeq ("$(shell test -f external/dcap_source/QuoteVerification/dcap_tvl/Makefile && echo TVL Makefile exists)", "TVL Makefile exists")

README.md

+39-54
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ Build the Intel(R) SGX SDK and Intel(R) SGX PSW Package
5555
* Ubuntu\* 16.04 LTS Server 64bits
5656
* Ubuntu\* 18.04 LTS Desktop 64bits
5757
* Ubuntu\* 18.04 LTS Server 64bits
58+
* Ubuntu\* 20.04 LTS Desktop 64bits
59+
* Ubuntu\* 20.04 LTS Server 64bits
5860
* Red Hat Enterprise Linux Server release 7.6 64bits
5961
* Red Hat Enterprise Linux Server release 8.2 64bits
60-
* CentOS 8.1 64bits
62+
* CentOS 8.2 64bits
6163
* Fedora 31 Server 64bits
62-
* SUSE Linux Enterprise Server 15 64bits
6364

6465
- Use the following command(s) to install the required tools to build the Intel(R) SGX SDK:
6566
* On Ubuntu 16.04:
@@ -70,13 +71,17 @@ Build the Intel(R) SGX SDK and Intel(R) SGX PSW Package
7071
```
7172
$ sudo apt-get install build-essential ocaml ocamlbuild automake autoconf libtool wget python libssl-dev git cmake perl
7273
```
74+
* On Ubuntu 20.04:
75+
```
76+
$ sudo apt-get install build-essential ocaml ocamlbuild automake autoconf libtool wget python-is-python3 libssl-dev git cmake perl
77+
```
7378
* On Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2:
7479
```
7580
$ sudo yum groupinstall 'Development Tools'
7681
$ sudo yum install ocaml ocaml-ocamlbuild wget python2 openssl-devel git cmake perl
7782
$ sudo alternatives --set python /usr/bin/python2
7883
```
79-
* On CentOS 8.1:
84+
* On CentOS 8.2:
8085
```
8186
$ sudo dnf group install 'Development Tools'
8287
$ sudo dnf --enablerepo=PowerTools install ocaml ocaml-ocamlbuild redhat-rpm-config openssl-devel wget rpm-build git cmake perl python2
@@ -86,37 +91,28 @@ Build the Intel(R) SGX SDK and Intel(R) SGX PSW Package
8691
```
8792
$ sudo yum groupinstall 'C Development Tools and Libraries'
8893
$ sudo yum install ocaml ocaml-ocamlbuild redhat-rpm-config openssl-devel wget python rpm-build git cmake perl
89-
```
90-
* On SUSE Linux Enterprise Server 15:
91-
```
92-
$ sudo zypper install --type pattern devel_basis
93-
$ sudo zypper install ocaml ocaml-ocamlbuild automake autoconf libtool wget python libopenssl-devel rpm-build git cmake perl
9494
```
9595
**Note**: To build Intel(R) SGX SDK, gcc version is required to be 7.3 or above and glibc version is required to be 2.27 or above. For Ubuntu 16.04, Red Hat Enterprise Linux 7.6, you may need to update gcc and glibc version manually.
9696
- Use the following command to install additional required tools and latest Intel(R) SGX SDK Installer to build the Intel(R) SGX PSW:
9797
1) To install the additional required tools:
98-
* On Ubuntu 16.04 and Ubuntu 18.04:
98+
* On Ubuntu 16.04, Ubuntu 18.04 and Ubuntu 20.04:
9999
```
100100
$ sudo apt-get install libssl-dev libcurl4-openssl-dev protobuf-compiler libprotobuf-dev debhelper cmake reprepro unzip
101101
```
102102
* On Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2 and Fedora 31:
103103
```
104104
$ sudo yum install openssl-devel libcurl-devel protobuf-devel cmake rpm-build createrepo yum-utils
105105
```
106-
* On CentOS 8.1:
106+
* On CentOS 8.2:
107107
```
108108
$ sudo dnf --enablerepo=PowerTools install openssl-devel libcurl-devel protobuf-devel cmake rpm-build createrepo yum-utils
109109
```
110-
* On SUSE Linux Enterprise Server 15:
111-
```
112-
$ sudo zypper install libopenssl-devel libcurl-devel protobuf-devel cmake rpm-build createrepo
113-
```
114110
2) To install latest Intel(R) SGX SDK Installer
115111
Ensure that you have downloaded latest Intel(R) SGX SDK Installer from the [Intel(R) SGX SDK](https://software.intel.com/en-us/sgx-sdk/download) and followed the Installation Guide in the same page to install latest Intel(R) SGX SDK Installer.
116112
117113
- Download the source code and prepare the submodules and prebuilt binaries:
118114
```
119-
$ git clone https://github.com/intel/linux-sgx.git
115+
$ git clone https://github.com/intel/linux-sgx.git
120116
$ cd linux-sgx && make preparation
121117
```
122118
The above ``make preparation`` would trigger the script ``download_prebuilt.sh`` to download the prebuilt binaries. You may need to set an https proxy for the `wget` tool used by the script (such as ``export https_proxy=http://test-proxy:test-port``)
@@ -188,13 +184,13 @@ You can find the tools and libraries generated in the `build/linux` directory.
188184
$ make
189185
```
190186
- To build the Intel(R) SGX PSW installer, enter the following command:
191-
* On Ubuntu 16.04 and Ubuntu 18.04:
187+
* On Ubuntu 16.04, Ubuntu 18.04 and Ubuntu 20.04:
192188
```
193189
$ make deb_psw_pkg
194190
```
195191
You can find the generated Intel(R) SGX PSW installers located under `linux/installer/deb/libsgx-urts`, `linux/installer/deb/libsgx-enclave-common`, `linux/installer/deb/libsgx-uae-service`, `linux/installer/deb/libsgx-epid`, `linux/installer/deb/libsgx-launch`, `linux/installer/deb/libsgx-quote-ex` and `linux/installer/deb/sgx-aesm-service` respectively.
196192
197-
**Note**: On Ubuntu 18.04, besides the Intel(R) SGX PSW installer, the above command generates another debug symbol package named ``package-name-dbgsym_${version}-${revision}_amd64.ddeb`` for debug purpose. On Ubuntu 16.04, if you want to keep debug symbols in the Intel(R) SGX PSW installer, before building the Intel(R) SGX PSW, you need to export an environment variable to ensure the debug symbols not stripped:
193+
**Note**: On Ubuntu 18.04 and Ubuntu 20.04, besides the Intel(R) SGX PSW installer, the above command generates another debug symbol package named ``package-name-dbgsym_${version}-${revision}_amd64.ddeb`` for debug purpose. On Ubuntu 16.04, if you want to keep debug symbols in the Intel(R) SGX PSW installer, before building the Intel(R) SGX PSW, you need to export an environment variable to ensure the debug symbols not stripped:
198194
```
199195
$ export DEB_BUILD_OPTIONS="nostrip"
200196
```
@@ -204,7 +200,7 @@ You can find the tools and libraries generated in the `build/linux` directory.
204200
```
205201
$ make deb_psw_pkg DEBUG=1
206202
```
207-
* On Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2, CentOS 8.1, Fedora 31 and SUSE Linux Enterprise Server 15:
203+
* On Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2, CentOS 8.2 and Fedora 31:
208204
```
209205
$ make rpm_psw_pkg
210206
```
@@ -233,8 +229,12 @@ You can find the tools and libraries generated in the `build/linux` directory.
233229
```
234230
deb [trusted=yes arch=amd64] file:/PATH_TO_LOCAL_REPO bionic main
235231
```
232+
* On Ubuntu 20.04:
233+
```
234+
deb [trusted=yes arch=amd64] file:/PATH_TO_LOCAL_REPO focal main
235+
```
236236
After that, you need to update the apt:
237-
* On Ubuntu 16.04 and Ubuntu 18.04:
237+
* On Ubuntu 16.04, Ubuntu 18.04 and Ubuntu 20.04:
238238
```
239239
$ sudo apt update
240240
```
@@ -248,23 +248,15 @@ You can find the tools and libraries generated in the `build/linux` directory.
248248
**Note**: The above command builds the local package repository. If you want to use it, you need to add it to the system repository configuration. Since the local package repository is not signed with GPG, you should ignore the gpgcheck when installing the packages.
249249
250250
- To add the local RPM package repository to the system repository configuration, you can use the following command. You need to replace PATH_TO_LOCAL_REPO with the proper path on your system:
251-
* On Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2, CentOS 8.1, Fedora 31:
251+
* On Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2, CentOS 8.2, Fedora 31:
252252
```
253253
$ sudo yum-config-manager --add-repo file://PATH_TO_LOCAL_REPO
254254
```
255-
* On SUSE Linux Enterprise Server 15, you need to replace LOCAL_REPO_ALIAS with proper alias name for the local repo:
256-
```
257-
$ sudo zypper addrepo PATH_TO_LOCAL_REPO LOCAL_REPO_ALIAS
258-
```
259255
- To ignore the gpgcheck when you install the package, enter the following command:
260-
* On Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2, CentOS 8.1, Fedora 31:
256+
* On Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2, CentOS 8.2, Fedora 31:
261257
```
262258
$ sudo yum --nogpgcheck install <package>
263259
```
264-
* On SUSE Linux Enterprise Server 15:
265-
```
266-
$ sudo zypper --no-gpg-checks install <package>
267-
```
268260
269261
Install the Intel(R) SGX SDK
270262
------------------------
@@ -274,17 +266,18 @@ Install the Intel(R) SGX SDK
274266
* Ubuntu\* 16.04 LTS Server 64bits
275267
* Ubuntu\* 18.04 LTS Desktop 64bits
276268
* Ubuntu\* 18.04 LTS Server 64bits
269+
* Ubuntu\* 20.04 LTS Desktop 64bits
270+
* Ubuntu\* 20.04 LTS Server 64bits
277271
* Red Hat Enterprise Linux Server release 7.6 64bits
278272
* Red Hat Enterprise Linux Server release 8.2 64bits
279-
* CentOS 8.1 64bits
273+
* CentOS 8.2 64bits
280274
* Fedora 31 Server 64bits
281-
* SUSE Linux Enterprise Server 15 64bits
282275
- Use the following command to install the required tool to use Intel(R) SGX SDK:
283-
* On Ubuntu 16.04 and Ubuntu 18.04:
276+
* On Ubuntu 16.04, Ubuntu 18.04 and Ubuntu 20.04:
284277
```
285278
$ sudo apt-get install build-essential python
286279
```
287-
* On Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2 and CentOS 8.1:
280+
* On Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2 and CentOS 8.2:
288281
```
289282
$ sudo yum groupinstall 'Development Tools'
290283
$ sudo yum install python2
@@ -294,11 +287,6 @@ Install the Intel(R) SGX SDK
294287
```
295288
$ sudo yum groupinstall 'C Development Tools and Libraries'
296289
```
297-
* On SUSE Linux Enterprise Server 15:
298-
```
299-
$ sudo zypper install --type pattern devel_basis
300-
$ sudo zypper install python
301-
```
302290
303291
### Install the Intel(R) SGX SDK
304292
To install the Intel(R) SGX SDK, invoke the installer, as follows:
@@ -344,44 +332,41 @@ Install the Intel(R) SGX PSW
344332
* Ubuntu\* 16.04 LTS Server 64bits
345333
* Ubuntu\* 18.04 LTS Desktop 64bits
346334
* Ubuntu\* 18.04 LTS Server 64bits
335+
* Ubuntu\* 20.04 LTS Desktop 64bits
336+
* Ubuntu\* 20.04 LTS Server 64bits
347337
* Red Hat Enterprise Linux Server release 7.6 64bits
348338
* Red Hat Enterprise Linux Server release 8.2 64bits
349-
* CentOS 8.1 64bits
339+
* CentOS 8.2 64bits
350340
* Fedora 31 Server 64bits
351-
* SUSE Linux Enterprise Server 15 64bits
352341
- Ensure that you have a system with the following required hardware:
353342
* 6th Generation Intel(R) Core(TM) Processor or newer
354343
- Configure the system with the **Intel SGX hardware enabled** option and install Intel(R) SGX driver in advance.
355344
See the earlier topic, *Build and Install the Intel(R) SGX Driver*, for information on how to install the Intel(R) SGX driver.
356345
- Install the library using the following command:
357-
* On Ubuntu 16.04 and Ubuntu 18.04:
346+
* On Ubuntu 16.04, Ubuntu 18.04 and Ubuntu 20.04:
358347
```
359348
$ sudo apt-get install libssl-dev libcurl4-openssl-dev libprotobuf-dev
360349
```
361350
* On Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2 and Fedora 31:
362351
```
363352
$ sudo yum install openssl-devel libcurl-devel protobuf-devel
364353
```
365-
* On CentOS 8.1:
354+
* On CentOS 8.2:
366355
```
367356
$ sudo dnf --enablerepo=PowerTools install libcurl-devel protobuf-devel
368357
```
369-
* On SUSE Linux Enterprise Server 15:
370-
```
371-
$ sudo zypper install libopenssl-devel libcurl-devel protobuf-devel
372-
```
373358
374359
### Install the Intel(R) SGX PSW
375360
- The SGX PSW provides 3 services: launch, EPID-based attestation, and algorithm agnostic attestation. Starting with the 2.8 release, the SGX PSW is split into smaller packages and the user can choose which features and services to install. There are 2 methods to install the required packages: Using individual packages or using the local repo generated by the build system. Using the local repo is recommended since the system will resolve the dependencies automatically. Currently, we support .deb and .rpm based repos.
376361
377362
#### Using the local repo(recommended)
378363
379-
| |Ubuntu 16.04, Ubuntu 18.04|Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2, CentOS 8.1, Fedora 31|SUSE Linux Enterprise Server 15|
380-
| ------------ | ------------ | ------------ | ------------ |
381-
|launch service |apt-get install libsgx-launch libsgx-urts|yum install libsgx-launch libsgx-urts|zypper install libsgx-launch libsgx-urts|
382-
|EPID-based attestation service|apt-get install libsgx-epid libsgx-urts|yum install libsgx-epid libsgx-urts|zypper install libsgx-epid libsgx-urts||
383-
|algorithm agnostic attestation service|apt-get install libsgx-quote-ex libsgx-urts|yum install libsgx-quote-ex libsgx-urts|zypper install libsgx-quote-ex libsgx-urts|
384-
|DCAP ECDSA-based service(Ubuntu16.04 not included)|apt-get install libsgx-dcap-ql|yum install libsgx-dcap-ql|zypper install libsgx-dcap-ql|
364+
| |Ubuntu 16.04, Ubuntu 18.04 and Ubuntu 20.04|Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2, CentOS 8.2, Fedora 31|
365+
| ------------ | ------------ | ------------ |
366+
|launch service |apt-get install libsgx-launch libsgx-urts|yum install libsgx-launch libsgx-urts|
367+
|EPID-based attestation service|apt-get install libsgx-epid libsgx-urts|yum install libsgx-epid libsgx-urts|
368+
|algorithm agnostic attestation service|apt-get install libsgx-quote-ex libsgx-urts|yum install libsgx-quote-ex libsgx-urts|
369+
|DCAP ECDSA-based service(Ubuntu16.04 not included)|apt-get install libsgx-dcap-ql|yum install libsgx-dcap-ql|
385370
386371
Optionally, you can install *-dbgsym or *-debuginfo packages to get the debug symbols, and install *-dev or *-devel packages to get the header files for development.
387372
@@ -391,15 +376,15 @@ Install the Intel(R) SGX PSW
391376
Please refer [Intel_SGX_Installation_Guide_Linux](https://download.01.org/intel-sgx/latest/linux-latest/docs/) for detail.
392377
393378
#### Upgrade from a legacy installation
394-
Before release 2.8, SGX PSW is installed as a single package named as libsgx-enclave-common. Starting with the 2.8 release, SGX PSW is split into smaller packages. libsgx-enclave-common is one of them. As a result, a simple upgrade will end up with a subset of the SGX PSW being installed on the system. You need to install additional packages to enable the required feature. At the same time, you will encounter some error message when you try to upgrade to release 2.8 from an old installation. You can use 2 methods to address it.
379+
Sometimes we will split old package into smaller ones or move file between different packages. In such cases, you will encounter error messages like: "dpkg: error processing archive ....(--unpack): trying to overwrite ...". You can use 2 methods to address it.
395380
* Uninstall the old installation first, then install new packages.
396381
* Add ``-o Dpkg::Options::="--force-overwrite"`` option to overwrite existing files and use “``dist-upgrade``” instead of "upgrade" to install new packages when upgrading. In short, you should use this command:
397382
```
398383
apt-get dist-upgrade -o Dpkg::Options::="--force-overwrite"
399384
```
400385
#### Configure the installation
401386
Some packages are configured with recommended dependency on other packages that are not required for certain usage. For instance, the background daemon is not required for container usage. It will be installed by default, but you can drop it by using the additional option during the installation.
402-
* On Ubuntu 16.04, Ubuntu 18.04:
387+
* On Ubuntu 16.04, Ubuntu 18.04 and Ubuntu 20.04:
403388
```
404389
--no-install-recommends
405390
```

buildenv.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ LD_IPP := -lippcp
273273

274274
######## SGX SDK Settings ########
275275
SGX_SDK ?= /opt/intel/sgxsdk
276-
SGX_HEADER_DIR := $(SGX_SDK)/include
276+
SGX_HEADER_DIR ?= $(SGX_SDK)/include
277277

278278
ifeq ($(ARCH), x86)
279279
SGX_COMMON_CFLAGS := -m32

0 commit comments

Comments
 (0)