Commit 39bdcd30 authored by Michał Kępień's avatar Michał Kępień Committed by Ondřej Surý
Browse files

Sort conditional installations alphabetically

parent ffdab6a5
......@@ -78,9 +78,13 @@ RUN apt-get -y install \
xsltproc \
zip \
zlib1g-dev
RUN if [ "@COMPILEDB@" = "yes" ]; then apt-get -y install python3-pip && pip3 install compiledb; fi
RUN if [ "@COCCINELLE@" = "yes" ]; then apt-get -y install coccinelle; fi
RUN if [ "@CPPCHECK@" = "yes" ]; then apt-get -y install cppcheck; fi
RUN if [ "@ABI_CHECK@" = "yes" ]; then \
apt-get -y install abi-compliance-checker abi-dumper w3m; \
# FIXME: This is Debian bug https://bugs.debian.org/952596. Before it
# gets fixed we patch with a Fedora version of the upstream fix (the
# upstream one does not apply cleanly).
curl -s https://src.fedoraproject.org/rpms/abi-dumper/raw/master/f/0001-Support-for-new-elfutils-Fedora-30.patch | patch /usr/bin/abi-dumper; \
fi
RUN if [ "@CLANG@" -ge "9" ] 2>/dev/null; then \
apt-get -y install \
llvm-@CLANG@ \
......@@ -90,18 +94,14 @@ RUN if [ "@CLANG@" -ge "9" ] 2>/dev/null; then \
clang-format-@CLANG@ \
clang-tidy-@CLANG@; \
fi
RUN if [ "@RESPDIFF@" = "yes" ]; then apt-get -y install python3-dpkt python3-lmdb python3-numpy python3-scipy python3-tabulate; fi
RUN if [ "@COCCINELLE@" = "yes" ]; then apt-get -y install coccinelle; fi
RUN if [ "@COMPILEDB@" = "yes" ]; then apt-get -y install python3-pip && pip3 install compiledb; fi
RUN if [ "@CPPCHECK@" = "yes" ]; then apt-get -y install cppcheck; fi
RUN if [ "@DNSTAP@" = "yes" ]; then apt-get -y install libfstrm-dev libprotobuf-c-dev protobuf-c-compiler; fi
RUN if [ "@RESPDIFF@" = "yes" ]; then apt-get -y install python3-dpkt python3-lmdb python3-numpy python3-scipy python3-tabulate; fi
RUN if [ "@SHELLCHECK@" = "yes" ]; then apt-get -y install shellcheck; fi
RUN if [ "@SOFTHSM@" -ge "2" ] 2>/dev/null; then apt-get -y install libsofthsm2 softhsm2; fi
RUN if [ "@SOFTHSM@" -lt "2" ] 2>/dev/null; then apt-get -y install libsofthsm softhsm; fi
RUN if [ "@SHELLCHECK@" = "yes" ]; then apt-get -y install shellcheck; fi
# FIXME: This is Debian bug https://bugs.debian.org/952596. Before
# it gets fixed we patch with a Fedora version of the upstream fix
# (the upstream one does not apply cleanly).
RUN if [ "@ABI_CHECK@" = "yes" ]; then \
apt-get -y install abi-compliance-checker abi-dumper w3m; \
curl -s https://src.fedoraproject.org/rpms/abi-dumper/raw/master/f/0001-Support-for-new-elfutils-Fedora-30.patch | patch /usr/bin/abi-dumper; \
fi
# Kyua and dependencies
RUN curl -sSL https://github.com/jmmv/atf/releases/download/atf-$ATF_VERSION/atf-$ATF_VERSION.tar.gz | tar -xz -C /usr/src
RUN cd /usr/src/atf-$ATF_VERSION && autoreconf -fi && ./configure --prefix /usr && make && make install
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment