From f0f7183cb7b21c31094aaee1bbd853ddbd396538 Mon Sep 17 00:00:00 2001 From: Piotr Krysik Date: Sat, 28 Jul 2018 12:44:23 +0200 Subject: tests: Fix Debian and Kali dockerfiles Change-Id: I61d37cb6882a8ca7bbfc97412c52e745a2e5ec7c --- tests/dockerfiles/Debian_testing.docker | 4 +--- tests/dockerfiles/Kali.docker | 4 +--- 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 && \ -- cgit v1.2.3