Change in gr-gsm[master]: travis: Install gr-osmosdr from the apt repository

[ptrkrysik]

ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24085 )

Change subject: travis: Install gr-osmosdr from the apt repository
......................................................................

travis: Install gr-osmosdr from the apt repository

Also install liborc-dev as gnuradio depends on it

Change-Id: I0bbc33a39ef1e4edc1636c338e429639e0b15066
---
M tests/dockerfiles/Debian_testing.docker
M tests/dockerfiles/Kali.docker
2 files changed, 9 insertions(+), 44 deletions(-)

Approvals:
  ptrkrysik: Looks good to me, approved; Verified



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 @@
     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 @@
     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

-- 
To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24085
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-Change-Id: I0bbc33a39ef1e4edc1636c338e429639e0b15066
Gerrit-Change-Number: 24085
Gerrit-PatchSet: 1
Gerrit-Owner: ptrkrysik <ptrkrysik at gmail.com>
Gerrit-Reviewer: ptrkrysik <ptrkrysik at gmail.com>
Gerrit-Reviewer: vvvelichkov <vvvelichkov at gmail.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210503/58284418/attachment.htm>