From c00008fa7bf42b49a35b2cc9a1a0a28295efec5a Mon Sep 17 00:00:00 2001
From: Vasil Velichkov <vvvelichkov@gmail.com>
Date: Mon, 2 Sep 2019 18:19:13 +0300
Subject: [PATCH] travis: Manually install gr-iqbal and gr-osmosdr

Currently these two packages still depends on gnuradio 3.8 in debian
testing and kali rolling.

Change-Id: I4f956577293c48d803b8b45d06ba508792501274
---
 tests/dockerfiles/Debian_testing.docker | 19 ++++++++++++++++++-
 tests/dockerfiles/Kali.docker           | 18 +++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker
index b95d958..e81d299 100644
--- a/tests/dockerfiles/Debian_testing.docker
+++ b/tests/dockerfiles/Debian_testing.docker
@@ -16,11 +16,28 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     gnuradio-dev gnuradio libgmp-dev libboost-regex-dev \
     libosmocore-dev
 
+# packages needed for gr-iqbal and gr-osmosdr
+RUN apt-get install -y git libuhd-dev
+
 COPY ./ /src/
-RUN ls /src
+
+RUN git clone --branch maint-3.8 --recurse-submodules https://github.com/velichkov/gr-iqbal && \
+    cd gr-iqbal && \
+    mkdir build && \
+    cd build && \
+    cmake .. && \
+    make -j $(nproc) install
+
+RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \
+    cd gr-osmosdr && \
+    mkdir build && \
+    cd build && \
+    cmake .. && \
+    make -j $(nproc) install
 
 RUN mkdir /src/build
 WORKDIR /src/build
+
 RUN cmake .. && \
     # The parallel build sometimes fails when the .grc_gnuradio
     # and .gnuradio directories do not exist
diff --git a/tests/dockerfiles/Kali.docker b/tests/dockerfiles/Kali.docker
index f386049..32548ca 100644
--- a/tests/dockerfiles/Kali.docker
+++ b/tests/dockerfiles/Kali.docker
@@ -16,8 +16,24 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     gnuradio-dev gnuradio libgmp-dev libboost-regex-dev \
     libosmocore-dev
 
+# packages needed for gr-iqbal and gr-osmosdr
+RUN apt-get install -y git libuhd-dev
+
 COPY ./ /src/
-RUN ls /src
+
+RUN git clone --branch maint-3.8 --recurse-submodules https://github.com/velichkov/gr-iqbal && \
+    cd gr-iqbal && \
+    mkdir build && \
+    cd build && \
+    cmake .. && \
+    make -j $(nproc) install
+
+RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \
+    cd gr-osmosdr && \
+    mkdir build && \
+    cd build && \
+    cmake .. && \
+    make -j $(nproc) install
 
 RUN mkdir /src/build
 WORKDIR /src/build