From 5ea1bbdcddb51766dc969d6eef1b4b465af8ab49 Mon Sep 17 00:00:00 2001
From: gaohuatao <gaohuatao@huawei.com>
Date: Sat, 18 Jul 2020 16:31:04 +0800
Subject: [PATCH] modify CI build lxc

Signed-off-by: gaohuatao <gaohuatao@huawei.com>
---
 CI/build.sh           |  2 --
 CI/install_depends.sh | 12 +++---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/CI/build.sh b/CI/build.sh
index d824f7a..92f16e4 100755
--- a/CI/build.sh
+++ b/CI/build.sh
@@ -388,8 +388,6 @@ do
         docker cp ${cptemp}/systemd ${container}:/lib
         # Docker cannot cp file to tmpfs /tmp in container
         docker exec ${container} sh -c "umask 0022 && cp -r ${testcase_data}/ci_testcase_data/embedded /tmp"
-        docker cp ${cptemp}/rpm ${container}:/
-        docker exec ${container} /bin/sh -c "rpm --force --nodeps -ivh /rpm/*"
     }&
 done
 wait
diff --git a/CI/install_depends.sh b/CI/install_depends.sh
index adfe198..2301a6c 100755
--- a/CI/install_depends.sh
+++ b/CI/install_depends.sh
@@ -28,7 +28,6 @@ build_log_crictl=${builddir}/build.crictl.log
 build_log_cni_plugins=${builddir}/build.cni_plugins.log
 buildlogs+=(${build_log_crictl} ${build_log_cni_plugins})
 
-mkdir -p ${builddir}/rpm
 mkdir -p ${builddir}/bin
 mkdir -p ${builddir}/include
 mkdir -p ${builddir}/lib
@@ -88,15 +87,10 @@ do
     patch -p1 < ${var}
 done
 sed -i 's/fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO/fd == 0 || fd == 1 || fd == 2 || fd >= 1000/g' ./src/lxc/start.c
-sed -i '/unmount-namespace/d' ./lxc.spec.in
-sed -i '/bridge-utils/d' ./lxc.spec.in
 ./autogen.sh
-./configure --sysconfdir=/etc
-make rpm
-cd ~/rpmbuild/RPMS/x86_64/
-rpm -ivh --force lxc-*.rpm
-mkdir -p ${builddir}/rpm
-cp lxc-*.rpm ${builddir}/rpm
+./configure --prefix=${builddir}
+make -j $(nproc)
+make install
 ldconfig
 
 # install lcr
-- 
GitLab