This is an automated email from the ASF dual-hosted git repository. dingyu pushed a commit to branch 2.12-for-1.1.3 in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-sgx-sdk.git
commit 86e9759b3c8f6363560c0f7650eb970f902ac8f5 Author: Yu Ding <[email protected]> AuthorDate: Wed Nov 11 11:55:39 2020 -0800 2.12 emergency upgrade for 1.1.3 --- Readme.md | 2 +- dockerfile/02_binutils.sh | 6 +++--- dockerfile/03_sdk.sh | 4 ++-- dockerfile/Dockerfile.1604.nightly | 6 +++--- dockerfile/Dockerfile.1804.nightly | 16 ++++++++-------- dockerfile/Dockerfile.2004.nightly | 19 +++++++++++-------- dockerfile/Dockerfile.centos8.nightly | 11 +++++------ dockerfile/Dockerfile.fedora31.nightly | 12 ++++++------ release_notes.md | 5 ++++- 9 files changed, 43 insertions(+), 38 deletions(-) diff --git a/Readme.md b/Readme.md index 718071a..a44b8f9 100644 --- a/Readme.md +++ b/Readme.md @@ -33,7 +33,7 @@ Current wiki pages: ## v1.1.3 -Supports Intel SGX SDK v2.11, and Rust nightly-2020-10-25. Added support to Ubuntu 20.04. [release_notes](release_notes.md). +Supports Intel SGX SDK v2.12, and Rust nightly-2020-10-25. Added support to Ubuntu 20.04. **We strongly recommend users to upgrade to Intel SGX SDK v2.12 and drivers to DCAP 1.36.2 and OOT 2.11.0.** [release_notes](release_notes.md). ## v1.1.2 diff --git a/dockerfile/02_binutils.sh b/dockerfile/02_binutils.sh index a6a04f5..cccc1db 100644 --- a/dockerfile/02_binutils.sh +++ b/dockerfile/02_binutils.sh @@ -1,10 +1,10 @@ if [ $BINUTILS_DIST != "SELF_BUILT" ] then cd /root && \ - wget https://download.01.org/intel-sgx/sgx-linux/2.11/as.ld.objdump.gold.r2.tar.gz - tar xzf as.ld.objdump.gold.r2.tar.gz && \ + wget https://download.01.org/intel-sgx/sgx-linux/2.12/as.ld.objdump.gold.r3.tar.gz && \ + tar xzf as.ld.objdump.gold.r3.tar.gz && \ cp -r external/toolset/$BINUTILS_DIST/* /usr/bin/ && \ - rm -rf ./external ./as.ld.objdump.gold.r2.tar.gz + rm -rf ./external ./as.ld.objdump.gold.r3.tar.gz else curl -o binutils.tar.xz https://ftp.gnu.org/gnu/binutils/binutils-2.35.tar.xz && \ tar xf binutils.tar.xz && \ diff --git a/dockerfile/03_sdk.sh b/dockerfile/03_sdk.sh index 8041136..2421ccf 100644 --- a/dockerfile/03_sdk.sh +++ b/dockerfile/03_sdk.sh @@ -10,10 +10,10 @@ else cd /root && \ git clone --recursive https://github.com/intel/linux-sgx && \ cd linux-sgx && \ - git checkout sgx_2.11 && \ + git checkout 608fe1df4c7c99433b0b8e9abdd31ba67c79ceb0 && \ ./download_prebuilt.sh && \ make -j "$(nproc)" sdk_install_pkg && \ - echo -e 'no\n/opt' | ./linux/installer/bin/sgx_linux_x64_sdk_2.11.100.2.bin && \ + echo -e 'no\n/opt' | ./linux/installer/bin/sgx_linux_x64_sdk_2.12.100.3.bin && \ echo 'source /opt/sgxsdk/environment' >> /root/.bashrc && \ cd /root && \ rm -rf /root/linux-sgx diff --git a/dockerfile/Dockerfile.1604.nightly b/dockerfile/Dockerfile.1604.nightly index 45bc7ca..276100b 100644 --- a/dockerfile/Dockerfile.1604.nightly +++ b/dockerfile/Dockerfile.1604.nightly @@ -1,6 +1,6 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y autoconf automake bison build-essential ca-certificates cmake curl dpkg-dev expect flex gdb git git-core gnupg kmod libboost-system-dev libboost-thread-dev libcurl4-openssl-dev libiptcdata0-dev libjsoncpp-dev liblog4cpp5-dev libprotobuf-c0-dev libprotobuf-dev libssl-dev libtool libxml2-dev ocaml pkg-config protobuf-compiler python sudo texinfo uuid-dev vim wget zlib1g-dev dkms gnupg2 apt-transport-https software-properties-common && \ +RUN apt-get update && apt-get install -y autoconf automake bison build-essential ca-certificates cmake curl dpkg-dev expect flex gdb git git-core gnupg kmod libboost-system-dev libboost-thread-dev libcurl4-openssl-dev libiptcdata0-dev libjsoncpp-dev liblog4cpp5-dev libprotobuf-c0-dev libprotobuf-dev libssl-dev libtool libxml2-dev ocaml pkg-config protobuf-compiler python texinfo uuid-dev vim wget zlib1g-dev dkms gnupg2 apt-transport-https software-properties-common && \ rm -rf /var/lib/apt/lists/* # Conditionally trust ppa:ubuntu-toolchain-r @@ -31,8 +31,8 @@ RUN bash /root/03_sdk.sh # Sixth, PSW ENV CODENAME xenial -ENV VERSION 2.11.100.2-xenial1 -ENV DCAP_VERSION 1.8.100.2-xenial1 +ENV VERSION 2.12.100.3-xenial1 +ENV DCAP_VERSION 1.9.100.3-xenial1 ADD 04_psw.sh /root RUN bash /root/04_psw.sh diff --git a/dockerfile/Dockerfile.1804.nightly b/dockerfile/Dockerfile.1804.nightly index 75f95e6..4d5c087 100644 --- a/dockerfile/Dockerfile.1804.nightly +++ b/dockerfile/Dockerfile.1804.nightly @@ -2,29 +2,29 @@ FROM ubuntu:18.04 ENV DEBIAN_FRONTEND=noninteractive -RUN apt update && apt install -y autoconf automake bison build-essential cmake curl dpkg-dev expect flex gcc-8 gdb git git-core gnupg kmod libboost-system-dev libboost-thread-dev libcurl4-openssl-dev libiptcdata0-dev libjsoncpp-dev liblog4cpp5-dev libprotobuf-c0-dev libprotobuf-dev libssl-dev libtool libxml2-dev ocaml ocamlbuild pkg-config protobuf-compiler python sudo systemd-sysv texinfo uuid-dev vim wget dkms gnupg2 apt-transport-https software-properties-common && \ +RUN apt update && apt install -y autoconf automake bison build-essential cmake curl dpkg-dev expect flex gcc-8 gdb git git-core gnupg kmod libboost-system-dev libboost-thread-dev libcurl4-openssl-dev libiptcdata0-dev libjsoncpp-dev liblog4cpp5-dev libprotobuf-c0-dev libprotobuf-dev libssl-dev libtool libxml2-dev ocaml ocamlbuild pkg-config protobuf-compiler python texinfo uuid-dev vim wget dkms gnupg2 apt-transport-https software-properties-common && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/apt/archives/* -#ENV BINUTILS_DIST="ubuntu18.04" -ENV BINUTILS_DIST="SELF_BUILT" +ENV BINUTILS_DIST="ubuntu18.04" +#ENV BINUTILS_DIST="SELF_BUILT" ENV LD_LIBRARY_PATH=/usr/lib:/usr/local/lib ENV LD_RUN_PATH=/usr/lib:/usr/local/lib ADD 02_binutils.sh /root RUN bash /root/02_binutils.sh -#ENV SDK_DIST="INTEL_BUILT" -#ENV SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.11/distro/ubuntu18.04-server/sgx_linux_x64_sdk_2.11.100.2.bin"; -ENV SDK_DIST="SELF_BUILT" +ENV SDK_DIST="INTEL_BUILT" +ENV SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.12/distro/ubuntu18.04-server/sgx_linux_x64_sdk_2.12.100.3.bin"; +#ENV SDK_DIST="SELF_BUILT" ADD 03_sdk.sh /root RUN bash /root/03_sdk.sh # Sixth, PSW ENV CODENAME bionic -ENV VERSION 2.11.100.2-bionic1 -ENV DCAP_VERSION 1.8.100.2-bionic1 +ENV VERSION 2.12.100.3-bionic1 +ENV DCAP_VERSION 1.9.100.3-bionic1 ADD 04_psw.sh /root RUN bash /root/04_psw.sh diff --git a/dockerfile/Dockerfile.2004.nightly b/dockerfile/Dockerfile.2004.nightly index f7e6bbc..98973c4 100644 --- a/dockerfile/Dockerfile.2004.nightly +++ b/dockerfile/Dockerfile.2004.nightly @@ -2,32 +2,35 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND=noninteractive -RUN apt update && apt install -y unzip lsb-release debhelper cmake reprepro autoconf automake bison build-essential curl dpkg-dev expect flex gcc-8 gdb git git-core gnupg kmod libboost-system-dev libboost-thread-dev libcurl4-openssl-dev libiptcdata0-dev libjsoncpp-dev liblog4cpp5-dev libprotobuf-dev libssl-dev libtool libxml2-dev ocaml ocamlbuild pkg-config protobuf-compiler python sudo systemd-sysv texinfo uuid-dev vim wget && \ +RUN apt update && apt install -y unzip lsb-release debhelper cmake reprepro autoconf automake bison build-essential curl dpkg-dev expect flex gcc-8 gdb git git-core gnupg kmod libboost-system-dev libboost-thread-dev libcurl4-openssl-dev libiptcdata0-dev libjsoncpp-dev liblog4cpp5-dev libprotobuf-dev libssl-dev libtool libxml2-dev ocaml ocamlbuild pkg-config protobuf-compiler python texinfo uuid-dev vim wget software-properties-common && \ rm -rf /var/lib/apt/lists/* #20.04 does have gcc-9 #ADD 01_gcc_8.sh /root #RUN bash /root/01_gcc_8.sh -#ENV BINUTILS_DIST="ubuntu20.04" -ENV BINUTILS_DIST="SELF_BUILT" +ENV BINUTILS_DIST="ubuntu20.04" +#ENV BINUTILS_DIST="SELF_BUILT" ENV LD_LIBRARY_PATH=/usr/lib:/usr/local/lib ENV LD_RUN_PATH=/usr/lib:/usr/local/lib ADD 02_binutils.sh /root RUN bash /root/02_binutils.sh -ENV SDK_DIST="SELF_BUILT" +#ENV SDK_DIST="SELF_BUILT" +ENV SDK_DIST="INTEL_BUILT" +ENV SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.12/distro/ubuntu20.04-server/sgx_linux_x64_sdk_2.12.100.3.bin"; ADD 03_sdk.sh /root RUN bash /root/03_sdk.sh # Sixth, PSW -ENV CODENAME bionic -ENV VERSION 2.11.100.2-focal +ENV CODENAME focal +ENV VERSION 2.12.100.3-focal1 +ENV DCAP_VERSION 1.9.100.3-focal1 -ADD 04_psw_deb.sh /root -RUN bash /root/04_psw_deb.sh +ADD 04_psw.sh /root +RUN bash /root/04_psw.sh # Seventh, Rust diff --git a/dockerfile/Dockerfile.centos8.nightly b/dockerfile/Dockerfile.centos8.nightly index ead8c20..0c26214 100644 --- a/dockerfile/Dockerfile.centos8.nightly +++ b/dockerfile/Dockerfile.centos8.nightly @@ -7,19 +7,18 @@ RUN dnf group install -y 'Development Tools' && \ #ADD 01_gcc_8.sh /root #RUN bash /root/01_gcc_8.sh -#ENV BINUTILS_DIST="centos8" -ENV BINUTILS_DIST="SELF_BUILT" +ENV BINUTILS_DIST="centos8.2" ADD 02_binutils.sh /root RUN bash /root/02_binutils.sh -#ENV SDK_DIST="INTEL_BUILT" -#ENV SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.11/distro/centos8.1-server/sgx_linux_x64_sdk_2.11.100.2.bin"; -ENV SDK_DIST="SELF_BUILT" +ENV SDK_DIST="INTEL_BUILT" +ENV SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.12/distro/centos8.2-server/sgx_linux_x64_sdk_2.12.100.3.bin"; +#ENV SDK_DIST="SELF_BUILT" ADD 03_sdk.sh /root RUN bash /root/03_sdk.sh -ENV PSW_REPO="https://download.01.org/intel-sgx/sgx-linux/2.11/distro/centos8.1-server/sgx_rpm_local_repo.tgz"; +ENV PSW_REPO="https://download.01.org/intel-sgx/sgx-linux/2.12/distro/centos8.2-server/sgx_rpm_local_repo.tgz"; ADD 04_psw_rpm.sh /root RUN bash /root/04_psw_rpm.sh diff --git a/dockerfile/Dockerfile.fedora31.nightly b/dockerfile/Dockerfile.fedora31.nightly index 00d574b..518e2da 100644 --- a/dockerfile/Dockerfile.fedora31.nightly +++ b/dockerfile/Dockerfile.fedora31.nightly @@ -8,21 +8,21 @@ RUN yum install -y yum-utils bzip2 ocaml ocaml-ocamlbuild wget python2 openssl-d #ADD 01_gcc_8.sh /root #RUN bash /root/01_gcc_8.sh -#ENV BINUTILS_DIST="fedora31" -ENV BINUTILS_DIST="SELF_BUILT" +ENV BINUTILS_DIST="fedora31" +#ENV BINUTILS_DIST="SELF_BUILT" ADD 02_binutils.sh /root RUN bash /root/02_binutils.sh -#ENV SDK_DIST="INTEL_BUILT" -#ENV SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.11/distro/fedora31-server/sgx_linux_x64_sdk_2.11.100.2.bin"; -ENV SDK_DIST="SELF_BUILT" +ENV SDK_DIST="INTEL_BUILT" +ENV SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.12/distro/fedora31-server/sgx_linux_x64_sdk_2.12.100.3.bin"; +#ENV SDK_DIST="SELF_BUILT" ADD 03_sdk.sh /root RUN bash /root/03_sdk.sh # Sixth, PSW -ENV PSW_REPO=https://download.01.org/intel-sgx/sgx-linux/2.11/distro/fedora31-server/sgx_rpm_local_repo.tgz +ENV PSW_REPO=https://download.01.org/intel-sgx/sgx-linux/2.12/distro/fedora31-server/sgx_rpm_local_repo.tgz ADD 04_psw_rpm.sh /root RUN bash /root/04_psw_rpm.sh diff --git a/release_notes.md b/release_notes.md index 41db122..f943330 100644 --- a/release_notes.md +++ b/release_notes.md @@ -1,11 +1,14 @@ # Rust SGX SDK v1.1.3 -**Supports Intel SGX SDK v2.11** +**Supports Intel SGX SDK v2.12** **Supports Rust nightly-2020-10-25** **Docker images** We provide docker images: 1604-1.1.3/1804-1.1.3/2004-1.1.3/fedora31-1.1.3/centos8-1.1.3 +**Please upgrade asap** Intel fixed couple of bugs in 2.12. Please upgrade as +soon as possible! + # Rust SGX SDK v1.1.2 **Supports Intel SGX SDK v2.9.1** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
