diff --git a/builder/stage4/05-pisdr-gnuradio/00-packages b/builder/stage4/05-pisdr-gnuradio/00-packages-nr similarity index 51% rename from builder/stage4/05-pisdr-gnuradio/00-packages rename to builder/stage4/05-pisdr-gnuradio/00-packages-nr index dabf4dc..a02b354 100644 --- a/builder/stage4/05-pisdr-gnuradio/00-packages +++ b/builder/stage4/05-pisdr-gnuradio/00-packages-nr @@ -2,12 +2,6 @@ cmake git g++ libboost-all-dev -python-dev -python-mako -python-numpy -python-wxgtk3.0 -python-sphinx -python-cheetah swig libzmq3-dev libfftw3-dev @@ -15,11 +9,18 @@ libgsl-dev libcppunit-dev libcomedi-dev libqt4-opengl-dev -python-qt4 libqwt-dev libsdl1.2-dev libusb-1.0-0-dev -python-gtk2 -python-lxml pkg-config -python-sip-dev \ No newline at end of file +python-wxgtk3.0 +python-qt4 +python-gtk2 +python-qt4 +python-lxml python3-lxml +python-sip-dev python3-sip-dev +python-mako python3-mako +python-dev python3-dev +python-numpy python3-numpy +python-sphinx python3-sphinx +python-cheetah python3-cheetah \ No newline at end of file diff --git a/builder/stage4/05-pisdr-gnuradio/00-run.sh b/builder/stage4/05-pisdr-gnuradio/00-run.sh index 07266c5..d88e227 100755 --- a/builder/stage4/05-pisdr-gnuradio/00-run.sh +++ b/builder/stage4/05-pisdr-gnuradio/00-run.sh @@ -14,7 +14,7 @@ git checkout maint-3.7 mkdir -p build cd build rm -rf CMakeCache.txt -cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/local/bin/python3 ../ +cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python ../ make -j$(nproc) install ldconfig EOF diff --git a/builder/stage4/06-pisdr-soapysdr/00-packages b/builder/stage4/06-pisdr-soapysdr/00-packages-nr similarity index 100% rename from builder/stage4/06-pisdr-soapysdr/00-packages rename to builder/stage4/06-pisdr-soapysdr/00-packages-nr diff --git a/builder/stage4/07-pisdr-limesdr/00-packages b/builder/stage4/07-pisdr-limesdr/00-packages-nr similarity index 100% rename from builder/stage4/07-pisdr-limesdr/00-packages rename to builder/stage4/07-pisdr-limesdr/00-packages-nr diff --git a/builder/stage4/10-pisdr-plutosdr/00-packages b/builder/stage4/10-pisdr-plutosdr/00-packages-nr similarity index 100% rename from builder/stage4/10-pisdr-plutosdr/00-packages rename to builder/stage4/10-pisdr-plutosdr/00-packages-nr diff --git a/builder/stage4/11-pisdr-sdrangel/00-packages b/builder/stage4/11-pisdr-sdrangel/00-packages-nr similarity index 100% rename from builder/stage4/11-pisdr-sdrangel/00-packages rename to builder/stage4/11-pisdr-sdrangel/00-packages-nr diff --git a/builder/stage4/12-pisdr-gqrx/00-packages b/builder/stage4/12-pisdr-gqrx/00-packages-nr similarity index 92% rename from builder/stage4/12-pisdr-gqrx/00-packages rename to builder/stage4/12-pisdr-gqrx/00-packages-nr index 96ebb9f..b4b6941 100644 --- a/builder/stage4/12-pisdr-gqrx/00-packages +++ b/builder/stage4/12-pisdr-gqrx/00-packages-nr @@ -22,4 +22,5 @@ libboost-all-dev libasound2-dev pulseaudio libopencv-dev -libxml2-dev \ No newline at end of file +libxml2-dev +libqt5svg5-dev \ No newline at end of file