From b80a63fc024ffdaea947cf8aa77d6de3d9ce05be Mon Sep 17 00:00:00 2001 From: liuzhengjun <792618492@qq.com> Date: Tue, 26 Sep 2023 07:54:16 +0000 Subject: [PATCH 1/2] =?UTF-8?q?update=20docs/build=5Fdocs/guide/script/ins?= =?UTF-8?q?tall=5FiSulad=5Fon=5FUbuntu=5F20=5F04=5FLTS.sh.=20=E9=99=90?= =?UTF-8?q?=E5=88=B6=E4=BE=9D=E8=B5=96=E4=BB=93lxc=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liuzhengjun <792618492@qq.com> --- .../guide/script/install_iSulad_on_Ubuntu_20_04_LTS.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build_docs/guide/script/install_iSulad_on_Ubuntu_20_04_LTS.sh b/docs/build_docs/guide/script/install_iSulad_on_Ubuntu_20_04_LTS.sh index 4f27244e..f2c66b18 100755 --- a/docs/build_docs/guide/script/install_iSulad_on_Ubuntu_20_04_LTS.sh +++ b/docs/build_docs/guide/script/install_iSulad_on_Ubuntu_20_04_LTS.sh @@ -16,7 +16,7 @@ mkdir -p $BUILD_DIR # build lxc cd $BUILD_DIR -git clone https://gitee.com/src-openeuler/lxc.git +git clone -b openEuler-20.03-LTS https://gitee.com/src-openeuler/lxc.git cd lxc ./apply-patches cd lxc-4.0.3 -- Gitee From d9c294baa2481c5675f10770233bec1367d82d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=96=E7=81=AB=E6=9F=B4=E7=9A=84=E5=B0=8F=E7=94=B7?= =?UTF-8?q?=E5=AD=A9?= <18281686389@163.com> Date: Thu, 12 Oct 2023 07:35:49 +0000 Subject: [PATCH 2/2] update docs/build_docs/guide/script/install_iSulad_on_Ubuntu_20_04_LTS.sh. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 卖火柴的小男孩 <18281686389@163.com> --- .../guide/script/install_iSulad_on_Ubuntu_20_04_LTS.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build_docs/guide/script/install_iSulad_on_Ubuntu_20_04_LTS.sh b/docs/build_docs/guide/script/install_iSulad_on_Ubuntu_20_04_LTS.sh index f2c66b18..82a4b153 100755 --- a/docs/build_docs/guide/script/install_iSulad_on_Ubuntu_20_04_LTS.sh +++ b/docs/build_docs/guide/script/install_iSulad_on_Ubuntu_20_04_LTS.sh @@ -6,7 +6,7 @@ set -e # export LDFLAGS export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH export LD_LIBRARY_PATH=/usr/local/lib:/usr/lib:/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH -echo "/usr/local/lib" >> /etc/ld.so.conf +# echo "/usr/local/lib" >> /etc/ld.so.conf apt install -y g++ libprotobuf-dev protobuf-compiler protobuf-compiler-grpc libgrpc++-dev libgrpc-dev libtool automake autoconf cmake make pkg-config libyajl-dev zlib1g-dev libselinux1-dev libseccomp-dev libcap-dev libsystemd-dev git libarchive-dev libcurl4-gnutls-dev openssl libdevmapper-dev python3 libtar0 libtar-dev libhttp-parser-dev libwebsockets-dev BUILD_DIR=/tmp/build_isulad -- Gitee