aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasil Velichkov <vvvelichkov@gmail.com>2019-09-09 18:22:55 +0300
committerPiotr Krysik <ptrkrysik@gmail.com>2020-02-14 15:14:59 +0000
commite52cd8f3cbadc0a31f3bfcd5343d8af72c66abdc (patch)
tree94c4832ca18df53d6cebb0b7bc3bed8fa8ad22c0
parent664f1cf938fc1d27708897af9c93774636b86b03 (diff)
travis: Add /usr/local/lib/python3/dist-packages/ to PYTHONPATH
and run ldconfig after installing gr-iqbal and gr-osmosdr. Due to debian-python-install patch [1] the OOT packages are installed in /usr/local/lib/python3/dist-packages but this path is not in the python3 default search paths (sys.path) and because of this importing OOT modules fails. [1] https://salsa.debian.org/bottoms/pkg-gnuradio/blob/25e1de07/debian/patches/debian-python-install Change-Id: I260c82d1a53dab85f7aac86f23e61309d8841255
-rw-r--r--tests/dockerfiles/Debian_testing.docker8
-rw-r--r--tests/dockerfiles/Kali.docker8
2 files changed, 10 insertions, 6 deletions
diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker
index 7fb7760..c482c52 100644
--- a/tests/dockerfiles/Debian_testing.docker
+++ b/tests/dockerfiles/Debian_testing.docker
@@ -26,19 +26,21 @@ RUN git clone --branch maint-3.8 --recurse-submodules https://github.com/velichk
mkdir build && \
cd build && \
cmake .. && \
- make -j $(nproc) install
+ 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
+ make -j $(nproc) install && \
+ ldconfig
RUN mkdir /src/build
WORKDIR /src/build
-RUN cmake .. && \
+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
mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \
diff --git a/tests/dockerfiles/Kali.docker b/tests/dockerfiles/Kali.docker
index 8b03930..8949bb5 100644
--- a/tests/dockerfiles/Kali.docker
+++ b/tests/dockerfiles/Kali.docker
@@ -26,18 +26,20 @@ RUN git clone --branch maint-3.8 --recurse-submodules https://github.com/velichk
mkdir build && \
cd build && \
cmake .. && \
- make -j $(nproc) install
+ 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
+ make -j $(nproc) install && \
+ ldconfig
RUN mkdir /src/build
WORKDIR /src/build
-RUN cmake .. && \
+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
mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \