diff options
| author | Vasil Velichkov <vvvelichkov@gmail.com> | 2019-09-02 18:19:13 +0300 |
|---|---|---|
| committer | Piotr Krysik <ptrkrysik@gmail.com> | 2020-02-14 15:14:07 +0000 |
| commit | 859453080c0bc1f50dd9fd5f504d16ac58b4a18d (patch) | |
| tree | f5f2f4148d6d76717b8a3cf5146bd07402161482 | |
| parent | a20e09c942ba7254d00ab0e8e0441f46dfc466ab (diff) | |
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
| -rw-r--r-- | tests/dockerfiles/Debian_testing.docker | 19 | ||||
| -rw-r--r-- | 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 |