Skip to content

Commit 500517a

Browse files
authored
Update README and script. (#727)
Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>
1 parent edfe42a commit 500517a

File tree

2 files changed

+13
-32
lines changed

2 files changed

+13
-32
lines changed

README.md

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ Build the Intel(R) SGX SDK and Intel(R) SGX PSW Package
8383
-------------------------------------------------------
8484
### Prerequisites:
8585
- Ensure that you have one of the following required operating systems:
86-
* Ubuntu\* 16.04 LTS Desktop 64bits
87-
* Ubuntu\* 16.04 LTS Server 64bits
8886
* Ubuntu\* 18.04 LTS Desktop 64bits
8987
* Ubuntu\* 18.04 LTS Server 64bits
9088
* Ubuntu\* 20.04 LTS Desktop 64bits
@@ -95,10 +93,6 @@ Build the Intel(R) SGX SDK and Intel(R) SGX PSW Package
9593
* Fedora 31 Server 64bits
9694

9795
- Use the following command(s) to install the required tools to build the Intel(R) SGX SDK:
98-
* On Ubuntu 16.04:
99-
```
100-
$ sudo apt-get install build-essential ocaml automake autoconf libtool wget python libssl-dev git cmake perl
101-
```
10296
* On Ubuntu 18.04:
10397
```
10498
$ sudo apt-get install build-essential ocaml ocamlbuild automake autoconf libtool wget python libssl-dev git cmake perl
@@ -124,10 +118,10 @@ Build the Intel(R) SGX SDK and Intel(R) SGX PSW Package
124118
$ sudo yum groupinstall 'C Development Tools and Libraries'
125119
$ sudo yum install ocaml ocaml-ocamlbuild redhat-rpm-config openssl-devel wget python rpm-build git cmake perl
126120
```
127-
**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.
121+
**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 Red Hat Enterprise Linux 7.6, you may need to update gcc and glibc version manually.
128122
- Use the following command to install additional required tools and latest Intel(R) SGX SDK Installer to build the Intel(R) SGX PSW:
129123
1) To install the additional required tools:
130-
* On Ubuntu 16.04, Ubuntu 18.04 and Ubuntu 20.04:
124+
* On Ubuntu 18.04 and Ubuntu 20.04:
131125
```
132126
$ sudo apt-get install libssl-dev libcurl4-openssl-dev protobuf-compiler libprotobuf-dev debhelper cmake reprepro unzip
133127
```
@@ -227,17 +221,14 @@ You can find the tools and libraries generated in the `build/linux` directory.
227221
$ make
228222
```
229223
- To build the Intel(R) SGX PSW installer, enter the following command:
230-
* On Ubuntu 16.04, Ubuntu 18.04 and Ubuntu 20.04:
224+
* On Ubuntu 18.04 and Ubuntu 20.04:
231225
```
232226
$ make deb_psw_pkg
233227
```
234228
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.
235229
236-
**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:
237-
```
238-
$ export DEB_BUILD_OPTIONS="nostrip"
239-
```
240-
**Note**: Starting with the 2.10 release, besides the Intel(R) SGX PSW installer, the above command generates [SGXDataCenterAttestationPrimitives](https://github.com/intel/SGXDataCenterAttestationPrimitives/) installers on OS newer than Ubuntu 16.04. Ubuntu 16.04 is not included because of GCC version.
230+
**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.
231+
**Note**: Starting with the 2.10 release, besides the Intel(R) SGX PSW installer, the above command generates [SGXDataCenterAttestationPrimitives](https://github.com/intel/SGXDataCenterAttestationPrimitives/) installers as well.
241232
242233
**Note**: The above command builds the Intel(R) SGX PSW with default configuration firstly and then generates the target PSW Installer. To build the Intel(R) SGX PSW Installer without optimization and with full debug information kept in the tools and libraries, enter the following command:
243234
```
@@ -264,10 +255,6 @@ You can find the tools and libraries generated in the `build/linux` directory.
264255
265256
- To add the local Debian package repository to the system repository configuration, append the following line to /etc/apt/sources.list. You need to replace PATH_TO_LOCAL_REPO with the proper path on your system:
266257
267-
* On Ubuntu 16.04:
268-
```
269-
deb [trusted=yes arch=amd64] file:/PATH_TO_LOCAL_REPO xenial main
270-
```
271258
* On Ubuntu 18.04:
272259
```
273260
deb [trusted=yes arch=amd64] file:/PATH_TO_LOCAL_REPO bionic main
@@ -277,7 +264,7 @@ You can find the tools and libraries generated in the `build/linux` directory.
277264
deb [trusted=yes arch=amd64] file:/PATH_TO_LOCAL_REPO focal main
278265
```
279266
After that, you need to update the apt:
280-
* On Ubuntu 16.04, Ubuntu 18.04 and Ubuntu 20.04:
267+
* On Ubuntu 18.04 and Ubuntu 20.04:
281268
```
282269
$ sudo apt update
283270
```
@@ -305,8 +292,6 @@ Install the Intel(R) SGX SDK
305292
------------------------
306293
### Prerequisites
307294
- Ensure that you have one of the following operating systems:
308-
* Ubuntu\* 16.04 LTS Desktop 64bits
309-
* Ubuntu\* 16.04 LTS Server 64bits
310295
* Ubuntu\* 18.04 LTS Desktop 64bits
311296
* Ubuntu\* 18.04 LTS Server 64bits
312297
* Ubuntu\* 20.04 LTS Desktop 64bits
@@ -316,7 +301,7 @@ Install the Intel(R) SGX SDK
316301
* CentOS 8.2 64bits
317302
* Fedora 31 Server 64bits
318303
- Use the following command to install the required tool to use Intel(R) SGX SDK:
319-
* On Ubuntu 16.04, Ubuntu 18.04 and Ubuntu 20.04:
304+
* On Ubuntu 18.04 and Ubuntu 20.04:
320305
```
321306
$ sudo apt-get install build-essential python
322307
```
@@ -371,8 +356,6 @@ Install the Intel(R) SGX PSW
371356
----------------------------
372357
### Prerequisites
373358
- Ensure that you have one of the following operating systems:
374-
* Ubuntu\* 16.04 LTS Desktop 64bits
375-
* Ubuntu\* 16.04 LTS Server 64bits
376359
* Ubuntu\* 18.04 LTS Desktop 64bits
377360
* Ubuntu\* 18.04 LTS Server 64bits
378361
* Ubuntu\* 20.04 LTS Desktop 64bits
@@ -386,7 +369,7 @@ Install the Intel(R) SGX PSW
386369
- Configure the system with the **Intel SGX hardware enabled** option and install Intel(R) SGX driver in advance.
387370
See the earlier topic, *Build and Install the Intel(R) SGX Driver*, for information on how to install the Intel(R) SGX driver.
388371
- Install the library using the following command:
389-
* On Ubuntu 16.04, Ubuntu 18.04 and Ubuntu 20.04:
372+
* On Ubuntu 18.04 and Ubuntu 20.04:
390373
```
391374
$ sudo apt-get install libssl-dev libcurl4-openssl-dev libprotobuf-dev
392375
```
@@ -404,17 +387,15 @@ The SGX PSW provides 3 services: launch, EPID-based attestation, and algorithm a
404387
405388
#### Using the local repo(recommended)
406389
407-
| |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|
390+
| |Ubuntu 18.04 and Ubuntu 20.04|Red Hat Enterprise Linux 7.6, Red Hat Enterprise Linux 8.2, CentOS 8.2, Fedora 31|
408391
| ------------ | ------------ | ------------ |
409392
|launch service |apt-get install libsgx-launch libsgx-urts|yum install libsgx-launch libsgx-urts|
410393
|EPID-based attestation service|apt-get install libsgx-epid libsgx-urts|yum install libsgx-epid libsgx-urts|
411394
|algorithm agnostic attestation service|apt-get install libsgx-quote-ex libsgx-urts|yum install libsgx-quote-ex libsgx-urts|
412-
|DCAP ECDSA-based service(Ubuntu16.04 not included)|apt-get install libsgx-dcap-ql|yum install libsgx-dcap-ql|
395+
|DCAP ECDSA-based service |apt-get install libsgx-dcap-ql|yum install libsgx-dcap-ql|
413396
414397
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.
415398
416-
**NOTE**: To debug with sgx-gdb on Ubuntu 16.04, you need to ensure the Intel(R) SGX PSW is built under the condition that the environment variable ``DEB_BUILD_OPTIONS="nostrip"`` is set.
417-
418399
#### Using the individual packages
419400
Please refer [Intel_SGX_Installation_Guide_Linux](https://download.01.org/intel-sgx/latest/linux-latest/docs/) for detail.
420401
@@ -427,7 +408,7 @@ apt-get dist-upgrade -o Dpkg::Options::="--force-overwrite"
427408
```
428409
#### Configure the installation
429410
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.
430-
* On Ubuntu 16.04, Ubuntu 18.04 and Ubuntu 20.04:
411+
* On Ubuntu 18.04 and Ubuntu 20.04:
431412
```
432413
--no-install-recommends
433414
```

linux/reproducibility/build_and_launch_docker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ mount_dir="/linux-sgx"
7676
sdk_installer=""
7777
sgx_src=""
7878

79-
default_sdk_installer=sgx_linux_x64_sdk_reproducible_2.14.100.2.bin
79+
default_sdk_installer=sgx_linux_x64_sdk_reproducible_2.14.100.1.bin
8080
default_sdk_installer_url=https://download.01.org/intel-sgx/sgx-linux/2.14/distro/nix_reproducibility/$default_sdk_installer
8181

8282
usage()
@@ -178,7 +178,7 @@ prepare_sgx_src()
178178
if [ "$sgx_src" != "" ]; then
179179
mkdir -p "$sgx_repo" && cp -a "$sgx_src/." "$sgx_repo"
180180
else
181-
git clone -b sgx_2.14.100_reproducible https://github.com/intel/linux-sgx.git $sgx_repo
181+
git clone -b sgx_2.14_reproducible https://github.com/intel/linux-sgx.git $sgx_repo
182182
fi
183183

184184
cd "$sgx_repo" && make preparation

0 commit comments

Comments
 (0)