aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasil Velichkov <vvvelichkov@gmail.com>2019-09-11 22:38:08 +0300
committerPiotr Krysik <ptrkrysik@gmail.com>2020-02-14 15:14:59 +0000
commitb3318d194d3f0cc21b3699ffa872d8303c26f3a7 (patch)
treefd2e9b2c2ae3ceb7af3712ebfd2a586c26b23cec
parentc7a536021f368223f546fc7bfb40db4aa76f730c (diff)
travis: Install gr-osmosdr from the apt repository
Also install liborc-dev as gnuradio depends on it Change-Id: I0bbc33a39ef1e4edc1636c338e429639e0b15066
-rw-r--r--tests/dockerfiles/Debian_testing.docker26
-rw-r--r--tests/dockerfiles/Kali.docker27
2 files changed, 9 insertions, 44 deletions
diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker
index c482c52..c4c3057 100644
--- a/tests/dockerfiles/Debian_testing.docker
+++ b/tests/dockerfiles/Debian_testing.docker
@@ -13,31 +13,13 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
liblog4cpp5-dev \
python3-docutils \
python3-scipy \
- 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 liborc-0.4-dev
+ gnuradio-dev gnuradio libgmp-dev libboost-regex-dev liborc-dev \
+ libosmocore-dev \
+ gr-osmosdr
COPY ./ /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 && \
- ldconfig
-
-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 && \
- ldconfig
-
-RUN mkdir /src/build
+RUN mkdir -p /src/build
WORKDIR /src/build
RUN PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH cmake .. && \
diff --git a/tests/dockerfiles/Kali.docker b/tests/dockerfiles/Kali.docker
index 8949bb5..a953ece 100644
--- a/tests/dockerfiles/Kali.docker
+++ b/tests/dockerfiles/Kali.docker
@@ -13,32 +13,15 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
liblog4cpp5-dev \
python3-docutils \
python3-scipy \
- 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 liborc-0.4-dev
+ gnuradio-dev gnuradio libgmp-dev libboost-regex-dev liborc-dev \
+ libosmocore-dev \
+ gr-osmosdr
COPY ./ /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 && \
- ldconfig
-
-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 && \
- ldconfig
-
-RUN mkdir /src/build
+RUN mkdir -p /src/build
WORKDIR /src/build
+
RUN PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH cmake .. && \
# The parallel build sometimes fails when the .grc_gnuradio
# and .gnuradio directories do not exist