From 7b6529687ca2f947c0dccec78b18f19567b12975 Mon Sep 17 00:00:00 2001 From: conglin Date: Mon, 30 Aug 2021 11:44:19 +0800 Subject: [PATCH] update docker of standard system Signed-off-by: conglin --- docker/CHANGELOG.md | 4 ++-- docker/standard/CHANGELOG.md | 9 ++++++++- docker/standard/CHANGELOG_en.md | 6 ++++++ docker/standard/Readme-en.md | 6 +++--- docker/standard/Readme.md | 6 +++--- docker/standard/build.sh | 2 +- docker/standard/prebuilts_download.sh | 4 ++-- docker/standard/prepare.sh | 3 ++- en/device-dev/get-code/gettools-acquire.md | 9 +++++---- .../quickstart-standard-docker-environment.md | 6 +++--- zh-cn/device-dev/get-code/gettools-acquire.md | 8 ++++---- .../quickstart-standard-docker-environment.md | 6 +++--- 12 files changed, 42 insertions(+), 27 deletions(-) diff --git a/docker/CHANGELOG.md b/docker/CHANGELOG.md index 00e40f6409..f09cd81c10 100644 --- a/docker/CHANGELOG.md +++ b/docker/CHANGELOG.md @@ -1,6 +1,6 @@ ### 0.0.5 （2021/06/21） -1、更新llvm版本从10.0.1-53907更新到10.0.1-62608。支撑ipcamera_hispark_taurus_linux编译。 +1、更新llvm版本从10.0.1-53907更新到10.0.1-62608，支撑ipcamera_hispark_taurus_linux编译。 2、增加安装bison、flex、bc、u-boot-tools和gcc-arm-linux-gnueabi。 @@ -22,7 +22,7 @@ ### 0.0.2（2020/12/23） -增加安装工具tzdata、default-jre、default-jdk、nodejs、hmos_app_packing_tool、hapsigntoolv2和hpm-cli工具 +增加安装工具tzdata、default-jre、default-jdk、nodejs、hmos_app_packing_tool、hapsigntoolv2和hpm-cli工具。 diff --git a/docker/standard/CHANGELOG.md b/docker/standard/CHANGELOG.md index 7e161f58d0..c6089a6645 100644 --- a/docker/standard/CHANGELOG.md +++ b/docker/standard/CHANGELOG.md @@ -1,7 +1,14 @@ + ### 0.0.3（2021/08/30） + +1、更新llvm版本从10.0.1-62608更新到10.0.1-69957。 + +2、增加安装gcc_aarch64。 + ### 0.0.2（2021/08/11） 新增安装llvm-10.0.1-62608和restool工具。 ### 0.0.1（2021/06/02） -提供OpenHarmony 2.0版本docker编译环境，预装编译依赖工具。 \ No newline at end of file +提供OpenHarmony 2.0版本docker编译环境，预装编译依赖工具。 + diff --git a/docker/standard/CHANGELOG_en.md b/docker/standard/CHANGELOG_en.md index 658a01359e..fa141e90b6 100644 --- a/docker/standard/CHANGELOG_en.md +++ b/docker/standard/CHANGELOG_en.md @@ -1,5 +1,11 @@ ### 0.0.2（2021/08/11） +1\. Updated LLVM from 10.0.1-62608 to 10.0.1-69957. + +2\. Added the installation of gcc_aarch64. + + ### 0.0.2（2021/08/11） + Add the installation of llvm-10.0.1-62608 and restool. ### 0.0.1（2021/06/02） diff --git a/docker/standard/Readme-en.md b/docker/standard/Readme-en.md index 6de964f0f2..43c04b716b 100755 --- a/docker/standard/Readme-en.md +++ b/docker/standard/Readme-en.md @@ -10,11 +10,11 @@ The Docker image of OpenHarmony is hosted on [HUAWEI Cloud SWR](https://auth.hua 1. Obtain the Docker image. ``` -docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3 ``` 2. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` -docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3 ``` ##### **Method 2: Using the Dockerfile to Build a Local Docker Image** @@ -30,7 +30,7 @@ cd docs/docker/standard ``` 3. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` -docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.3 ``` ### Building for Standard-System Devices (reference memory ≥ 128 MB) diff --git a/docker/standard/Readme.md b/docker/standard/Readme.md index 3ad20d1370..a68037a0ad 100755 --- a/docker/standard/Readme.md +++ b/docker/standard/Readme.md @@ -10,11 +10,11 @@ OpenHarmony的Docker镜像托管在HuaweiCloud SWR上。开发者可以通过该 1. 获取Docker镜像。 ``` -docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3 ``` 2. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` -docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3 ``` ##### 方式二：通过Dockerfile 构建本地Docker镜像进行构建 @@ -30,7 +30,7 @@ cd docs/docker/standard ``` 3. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` -docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.3 ``` ### 编译源码-标准系统类设备（参考内存≥128MB） diff --git a/docker/standard/build.sh b/docker/standard/build.sh index 7f38da71f6..5371886ecb 100755 --- a/docker/standard/build.sh +++ b/docker/standard/build.sh @@ -13,4 +13,4 @@ #!/bin/sh -docker build -t openharmony-docker-standard:0.0.2 . +docker build -t openharmony-docker-standard:0.0.3 . diff --git a/docker/standard/prebuilts_download.sh b/docker/standard/prebuilts_download.sh index 9a410a27d5..307b706921 100755 --- a/docker/standard/prebuilts_download.sh +++ b/docker/standard/prebuilts_download.sh @@ -30,9 +30,9 @@ prebuilts/python,https://repo.huaweicloud.com/harmonyos/compiler/python/3.8.5/li prebuilts/mingw-w64/ohos/linux-x86_64,https://repo.huaweicloud.com/harmonyos/compiler/mingw-w64/7.0.0/clang-mingw.tar.gz prebuilts,https://repo.huaweicloud.com/harmonyos/compiler/hc-gen/0.65/linux/hc-gen-0.65-linux.tar prebuilts/gcc/linux-x86/arm,https://repo.huaweicloud.com/harmonyos/compiler/prebuilts_gcc_linux-x86_arm_gcc-linaro-7.5.0-arm-linux-gnueabi/1.0/prebuilts_gcc_linux-x86_arm_gcc-linaro-7.5.0-arm-linux-gnueabi.tar.gz -prebuilts/clang/host,https://repo.huaweicloud.com/harmonyos/compiler/prebuilts_clang_aosp_linux-x86_64/1.0/prebuilts_clang_aosp_linux-x86_64.tar.gz +prebuilts/gcc/linux-x86/aarch64,https://repo.huaweicloud.com/harmonyos/compiler/prebuilts_gcc_linux-x86_arm_gcc-linaro-7.5.0-arm-linux-gnueabi/1.0/gcc-linaro-7.5.0-2019.12-x86_64-aarch64-linux-gnu.tar.xz prebuilts/sdk/js-loader/build-tools,https://repo.huaweicloud.com/harmonyos/compiler/ace-loader/1.0/ace-loader.tar.gz -prebuilts/clang/ohos/linux-x86_64,https://repo.huaweicloud.com/harmonyos/compiler/clang/10.0.1-62608/linux/llvm.tar.gz +prebuilts/clang/ohos/linux-x86_64,https://repo.huaweicloud.com/harmonyos/compiler/clang/10.0.1-69957/linux/clang-69957-linux-x86_64.tar.bz2 prebuilts/build-tools/common,https://repo.huaweicloud.com/harmonyos/compiler/restool/1.023-c/restool.tar.gz """ if [ ! -d "${bin_dir}" ];then diff --git a/docker/standard/prepare.sh b/docker/standard/prepare.sh index 31cd1a9467..d3e3a1f65a 100755 --- a/docker/standard/prepare.sh +++ b/docker/standard/prepare.sh @@ -63,11 +63,12 @@ fi echo link mingw-w64 ln -s $TOOLSDIR/mingw-w64 $WORKDIR/prebuilts/mingw-w64 -mv $TOOLSDIR/clang/host/prebuilts_clang_aosp_linux-x86_64 $TOOLSDIR/clang/host/linux-x86 +mv $TOOLSDIR/clang/ohos/linux-x86_64/clang-69957 $TOOLSDIR/clang/ohos/linux-x86_64/llvm if [[ -h $WORKDIR/prebuilts/clang ]]; then rm $WORKDIR/prebuilts/clang fi echo link clang +ln -snf 10.0.1 $TOOLSDIR/clang/ohos/linux-x86_64/llvm/lib/clang/current ln -s $TOOLSDIR/clang $WORKDIR/prebuilts/clang mv $TOOLSDIR/gcc/linux-x86/arm/prebuilts_gcc_linux-x86_arm_gcc-linaro-7.5.0-arm-linux-gnueabi $TOOLSDIR/gcc/linux-x86/arm/gcc-linaro-7.5.0-arm-linux-gnueabi diff --git a/en/device-dev/get-code/gettools-acquire.md b/en/device-dev/get-code/gettools-acquire.md index b28068971e..f8170822bd 100644 --- a/en/device-dev/get-code/gettools-acquire.md +++ b/en/device-dev/get-code/gettools-acquire.md @@ -52,7 +52,7 @@ OpenHarmony provides the following two types of Docker environments for you to q

swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard

-

0.0.2

+

0.0.3

HPM-based Docker environment

@@ -69,6 +69,7 @@ OpenHarmony provides the following two types of Docker environments for you to q + ## Preparations Before using the Docker environment, perform the following operations: @@ -180,13 +181,13 @@ hb set 1. Obtain the Docker image. ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3 ``` 2. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3 ``` @@ -208,7 +209,7 @@ hb set 3. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.3 ``` diff --git a/en/device-dev/quick-start/quickstart-standard-docker-environment.md b/en/device-dev/quick-start/quickstart-standard-docker-environment.md index 6ab8318f3d..1791ce953a 100644 --- a/en/device-dev/quick-start/quickstart-standard-docker-environment.md +++ b/en/device-dev/quick-start/quickstart-standard-docker-environment.md @@ -61,13 +61,13 @@ repo forall -c 'git lfs pull' 1. Obtain the Docker image. ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3 ``` 2. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3 ``` @@ -89,7 +89,7 @@ repo forall -c 'git lfs pull' 3. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.3 ``` diff --git a/zh-cn/device-dev/get-code/gettools-acquire.md b/zh-cn/device-dev/get-code/gettools-acquire.md index f18b6c2ce0..654fac2dcc 100644 --- a/zh-cn/device-dev/get-code/gettools-acquire.md +++ b/zh-cn/device-dev/get-code/gettools-acquire.md @@ -52,7 +52,7 @@ OpenHarmony为开发者提供了两种Docker环境，以帮助开发者快速完

swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard

-

0.0.2

+

0.0.3

HPM Docker环境

@@ -180,13 +180,13 @@ hb set 1. 获取Docker镜像。 ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3 ``` 2. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3 ``` @@ -208,7 +208,7 @@ hb set 3. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.3 ``` diff --git a/zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md b/zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md index 33eb5846c4..7169920a19 100644 --- a/zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md +++ b/zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md @@ -61,13 +61,13 @@ repo forall -c 'git lfs pull' 1. 获取Docker镜像。 ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3 ``` 2. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.3 ``` @@ -89,7 +89,7 @@ repo forall -c 'git lfs pull' 3. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.3 ``` -- GitLab