diff options
| author | Piotr Krysik <ptrkrysik@gmail.com> | 2018-07-28 12:44:23 +0200 |
|---|---|---|
| committer | Piotr Krysik <ptrkrysik@gmail.com> | 2018-07-28 13:25:00 +0200 |
| commit | 332e2be78f9cf82a7b6a0f053d2bfd87974b9998 (patch) | |
| tree | 1ed43b923326b378afda139ef142a6296e8e5e10 | |
| parent | e4010dbef0950a1140f14e63313a5e54294ee1aa (diff) | |
tests: Fix Debian and Kali dockerfiles
Change-Id: I61d37cb6882a8ca7bbfc97412c52e745a2e5ec7c
| -rw-r--r-- | tests/dockerfiles/Debian_testing.docker | 4 | ||||
| -rw-r--r-- | 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 && \ |