提交 5ea1bbdc 编写于 作者: G gaohuatao 提交者: lifeng68

modify CI build lxc

Signed-off-by: Ngaohuatao <gaohuatao@huawei.com>
上级 9595034a
...@@ -388,8 +388,6 @@ do ...@@ -388,8 +388,6 @@ do
docker cp ${cptemp}/systemd ${container}:/lib docker cp ${cptemp}/systemd ${container}:/lib
# Docker cannot cp file to tmpfs /tmp in container # 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 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 done
wait wait
......
...@@ -28,7 +28,6 @@ build_log_crictl=${builddir}/build.crictl.log ...@@ -28,7 +28,6 @@ build_log_crictl=${builddir}/build.crictl.log
build_log_cni_plugins=${builddir}/build.cni_plugins.log build_log_cni_plugins=${builddir}/build.cni_plugins.log
buildlogs+=(${build_log_crictl} ${build_log_cni_plugins}) buildlogs+=(${build_log_crictl} ${build_log_cni_plugins})
mkdir -p ${builddir}/rpm
mkdir -p ${builddir}/bin mkdir -p ${builddir}/bin
mkdir -p ${builddir}/include mkdir -p ${builddir}/include
mkdir -p ${builddir}/lib mkdir -p ${builddir}/lib
...@@ -88,15 +87,10 @@ do ...@@ -88,15 +87,10 @@ do
patch -p1 < ${var} patch -p1 < ${var}
done 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 '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 ./autogen.sh
./configure --sysconfdir=/etc ./configure --prefix=${builddir}
make rpm make -j $(nproc)
cd ~/rpmbuild/RPMS/x86_64/ make install
rpm -ivh --force lxc-*.rpm
mkdir -p ${builddir}/rpm
cp lxc-*.rpm ${builddir}/rpm
ldconfig ldconfig
# install lcr # install lcr
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册