aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Krysik <ptrkrysik@gmail.com>2018-07-28 12:44:23 +0200
committerPiotr Krysik <ptrkrysik@gmail.com>2018-09-13 15:35:44 +0200
commitf0f7183cb7b21c31094aaee1bbd853ddbd396538 (patch)
treea0cfe1b0b5c86f9a19a858d06b8fe36645dc8e1b
parent8d30757dc0e5f8ccb79cc011d3433a3a25afe34c (diff)
tests: Fix Debian and Kali dockerfiles
-rw-r--r--tests/dockerfiles/Debian_testing.docker4
-rw-r--r--tests/dockerfiles/Kali.docker4
2 files changed, 2 insertions, 6 deletions
diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker
index 99a8d96..a3d16ba 100644
--- a/tests/dockerfiles/Debian_testing.docker
+++ b/tests/dockerfiles/Debian_testing.docker
@@ -12,6 +12,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
swig \
doxygen \
liblog4cpp5-dev \
+ python-gtk2 \
python-scipy \
gnuradio-dev \
gr-osmosdr \
@@ -26,9 +27,6 @@ RUN cmake .. && \
# The parallel build sometimes fails when the .grc_gnuradio
# and .gnuradio directories do not exist
mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \
- # Workaround for the grcc failure
- # https://github.com/ptrkrysik/gr-gsm/pull/378#issuecomment-379587145
- ln -sf /usr/lib/x86_64-linux-gnu/libvolk.so.1.3.1 /usr/lib/x86_64-linux-gnu/libvolk.so.1.3 && \
make -j $(nproc) && \
make install && \
ldconfig && \
diff --git a/tests/dockerfiles/Kali.docker b/tests/dockerfiles/Kali.docker
index 1ae5442..52cc110 100644
--- a/tests/dockerfiles/Kali.docker
+++ b/tests/dockerfiles/Kali.docker
@@ -12,6 +12,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
swig \
doxygen \
liblog4cpp5-dev \
+ python-gtk2 \
python-scipy \
gnuradio-dev \
gr-osmosdr \
@@ -26,9 +27,6 @@ RUN cmake .. && \
# The parallel build sometimes fails when the .grc_gnuradio
# and .gnuradio directories do not exist
mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \
- # Workaround for the grcc failure
- # https://github.com/ptrkrysik/gr-gsm/pull/378#issuecomment-379587145
- ln -sf /usr/lib/x86_64-linux-gnu/libvolk.so.1.3.1 /usr/lib/x86_64-linux-gnu/libvolk.so.1.3 && \
make -j $(nproc) && \
make install && \
ldconfig && \