提交 b814f5a2 编写于 作者: O openeuler-ci-bot 提交者: Gitee

!225 lxc: update lxc to 4.0.1

Merge pull request !225 from lifeng_isula/update_lxc
...@@ -93,14 +93,15 @@ check_make_status make_cni_plugins ${build_log_cni_plugins} & ...@@ -93,14 +93,15 @@ check_make_status make_cni_plugins ${build_log_cni_plugins} &
cd ~ cd ~
git clone https://gitee.com/src-openeuler/lxc.git git clone https://gitee.com/src-openeuler/lxc.git
cd lxc cd lxc
tar xf lxc-3.0.3.tar.gz tar xf lxc-4.0.1.tar.gz
cd lxc-3.0.3 cd lxc-4.0.1
mv ../*.patch . mv ../*.patch .
for var in $(ls 0*.patch | sort -n) for var in $(ls 0*.patch | sort -n)
do 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
./autogen.sh ./autogen.sh
./configure --sysconfdir=/etc ./configure --sysconfdir=/etc
make rpm make rpm
......
...@@ -217,7 +217,7 @@ RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH && \ ...@@ -217,7 +217,7 @@ RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH && \
git clone https://gitee.com/src-openeuler/lxc.git && \ git clone https://gitee.com/src-openeuler/lxc.git && \
cd lxc && \ cd lxc && \
./apply-patches && \ ./apply-patches && \
cd lxc-3.0.3 && \ cd lxc-4.0.1 && \
./autogen.sh && \ ./autogen.sh && \
./configure && \ ./configure && \
make -j $(nproc) && \ make -j $(nproc) && \
......
...@@ -721,7 +721,6 @@ def gen_common_files(out): ...@@ -721,7 +721,6 @@ def gen_common_files(out):
Interface: None Interface: None
History: 2019-06-17 History: 2019-06-17
""" """
print(out, " gao\n")
with open(os.path.join(out, 'json_common.h'), "w") as \ with open(os.path.join(out, 'json_common.h'), "w") as \
header_file, open(os.path.join(out, 'json_common.c'), "w") as source_file: header_file, open(os.path.join(out, 'json_common.c'), "w") as source_file:
fcntl.flock(header_file, fcntl.LOCK_EX) fcntl.flock(header_file, fcntl.LOCK_EX)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册