diff --git a/CI/Dockerfile-centos b/CI/Dockerfile-centos index bafc87e15..7250b7bdb 100644 --- a/CI/Dockerfile-centos +++ b/CI/Dockerfile-centos @@ -88,6 +88,7 @@ RUN yum clean all && yum makecache && yum install -y epel-release && yum swap -y lvm2 \ tcpdump \ sysvinit-tools +RUN pip3 install meson ninja RUN yum clean all && \ (cd /lib/systemd/system/sysinit.target.wants/; for i in *; \ diff --git a/CI/dockerfiles/Dockerfile-fedora b/CI/dockerfiles/Dockerfile-fedora index 44059cf11..7496602bf 100644 --- a/CI/dockerfiles/Dockerfile-fedora +++ b/CI/dockerfiles/Dockerfile-fedora @@ -94,6 +94,7 @@ RUN dnf update -y && dnf install -y automake \ iputils RUN dnf clean all +RUN pip3 install meson ninja # disalbe sslverify RUN git config --global http.sslverify false diff --git a/CI/dockerfiles/Dockerfile-ubuntu b/CI/dockerfiles/Dockerfile-ubuntu index e056beb55..f84ae0a7d 100644 --- a/CI/dockerfiles/Dockerfile-ubuntu +++ b/CI/dockerfiles/Dockerfile-ubuntu @@ -85,6 +85,7 @@ RUN apt update -y && apt upgrade -y && \ tcpdump RUN apt autoremove -y +RUN pip3 install meson ninja RUN echo "export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" >> /etc/bashrc && \ echo "export LD_LIBRARY_PATH=/usr/local/lib:/usr/lib:$LD_LIBRARY_PATH" >> /etc/bashrc && \ diff --git a/CI/install_depends.sh b/CI/install_depends.sh index fe9c14e12..1d575dfb4 100755 --- a/CI/install_depends.sh +++ b/CI/install_depends.sh @@ -107,10 +107,10 @@ git clone https://gitee.com/src-openeuler/lxc.git cd lxc ./apply-patches cd lxc-5.0.2 +mkdir -p build 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 -meson setup -Disulad=true -Dtests=false -Dprefix=${builddir} build -make -j $(nproc) -make install +meson setup -Disulad=true -Dprefix=${builddir} build +meson install -C build ldconfig # install lcr diff --git a/Dockerfile b/Dockerfile index 84111abc5..3b284630e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -86,6 +86,7 @@ RUN yum clean all && yum makecache && yum install -y epel-release && yum swap -y CUnit-devel \ valgrind \ e2fsprogs +RUN pip3 install meson ninja RUN yum clean all && \ (cd /lib/systemd/system/sysinit.target.wants/; for i in *; \