1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00

fixes for CI

This commit is contained in:
Steffen Vogel 2020-01-25 17:48:36 +01:00
parent 5eb267ecdf
commit 755a1abab2
5 changed files with 14 additions and 13 deletions

View file

@ -96,7 +96,7 @@ RUN cd /tmp && \
rm -rf /tmp/Criterion
# Build & Install EtherLab
RUN cmd /tmp && \
RUN cd /tmp && \
hg clone --branch stable-1.5 http://hg.code.sf.net/p/etherlabmaster/code etherlab && \
cd etherlab && \
./bootstrap && ./configure --enable-userlib=yes --enable-kernel=no --enable-tool=no && \

View file

@ -51,7 +51,7 @@ RUN yum -y install \
pkgconfig make cmake3 \
autoconf automake autogen libtool \
flex bison \
texinfo git curl tar \
texinfo git mercurial curl tar \
protobuf-compiler protobuf-c-compiler
# Several tools only needed for developement and testing
@ -89,7 +89,7 @@ RUN yum -y install \
libibverbs-devel \
librdmacm-devel \
re-devel \
uldaq-devel
libusb1-devel
# Build & Install fmtlib
RUN cd /tmp && \
@ -138,7 +138,7 @@ RUN cd /tmp && \
rm -rf /tmp/uldaq
# Build & Install EtherLab
RUN cmd /tmp && \
RUN cd /tmp && \
hg clone --branch stable-1.5 http://hg.code.sf.net/p/etherlabmaster/code etherlab && \
cd etherlab && \
./bootstrap && ./configure --enable-userlib=yes --enable-kernel=no --enable-tool=no && \

View file

@ -48,7 +48,7 @@ RUN dpkg --add-architecture ${ARCH}
RUN apt-get update && apt-get install -y \
crossbuild-essential-${ARCH} \
pkg-config make ninja-build \
texinfo git curl tar wget\
texinfo git mercurial curl tar wget\
protobuf-compiler protobuf-c-compiler
# Dependencies
@ -126,7 +126,7 @@ RUN cd /tmp && \
rm -rf /tmp/uldaq
# Build & Install EtherLab
RUN cmd /tmp && \
RUN cd /tmp && \
hg clone --branch stable-1.5 http://hg.code.sf.net/p/etherlabmaster/code etherlab && \
cd etherlab && \
./bootstrap && ./configure --enable-userlib=yes --enable-kernel=no --enable-tool=no && \

View file

@ -32,7 +32,7 @@ RUN apt-get update && \
apt-get install -y \
autoconf automake libtool cmake \
pkg-config make gcc g++\
git curl wget tar bzip2 \
git mercurial curl wget tar bzip2 \
protobuf-compiler protobuf-c-compiler
# Dependencies
@ -100,7 +100,7 @@ RUN cd /tmp && \
rm -rf /tmp/uldaq
# Build & Install EtherLab
RUN cmd /tmp && \
RUN cd /tmp && \
hg clone --branch stable-1.5 http://hg.code.sf.net/p/etherlabmaster/code etherlab && \
cd etherlab && \
./bootstrap && ./configure --enable-userlib=yes --enable-kernel=no --enable-tool=no && \

View file

@ -40,9 +40,9 @@ ENV DEBIAN_FRONTEND=noninteractive
# Toolchain
RUN apt-get update && apt-get install -y \
gcc g++ \
pkg-config cmake make ninja-build \
texinfo git curl tar \
autoconf automake libtool cmake \
pkg-config make gcc g++ ninja-build \
texinfo git mercurial curl tar \
protobuf-compiler protobuf-c-compiler
# Several tools only needed for developement and testing
@ -78,7 +78,8 @@ RUN apt-get update && apt-get install -y \
libcomedi-dev \
libibverbs-dev \
librdmacm-dev \
libre-dev
libre-dev \
libusb-1.0-0-dev
# Build & Install fmtlib
RUN cd /tmp && \
@ -127,7 +128,7 @@ RUN cd /tmp && \
rm -rf /tmp/uldaq
# Build & Install EtherLab
RUN cmd /tmp && \
RUN cd /tmp && \
hg clone --branch stable-1.5 http://hg.code.sf.net/p/etherlabmaster/code etherlab && \
cd etherlab && \
./bootstrap && ./configure --enable-userlib=yes --enable-kernel=no --enable-tool=no && \