Skip to content

Commit

Permalink
!2218 install meson in CI
Browse files Browse the repository at this point in the history
* install meson in CI
  • Loading branch information
DawningRain authored and duguhaotian committed Oct 26, 2023
1 parent cd9c456 commit 1bc741f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions CI/Dockerfile-centos
Original file line number Diff line number Diff line change
Expand Up @@ -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 *; \
Expand Down
1 change: 1 addition & 0 deletions CI/dockerfiles/Dockerfile-fedora
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CI/dockerfiles/Dockerfile-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
6 changes: 3 additions & 3 deletions CI/install_depends.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 *; \
Expand Down

0 comments on commit 1bc741f

Please sign in to comment.