From 7e7fe38f32d94e333147eaf5430c155d4cf2cf65 Mon Sep 17 00:00:00 2001
From: Luigi Cruz <luigifcruz@gmail.com>
Date: Sat, 1 Aug 2020 01:08:59 -0300
Subject: [PATCH] GR 3.8, UHD (experimental), Ninja builder

---
 builder/build.sh                              | 24 +++++++------
 builder/stage4/04-pisdr-system/00-packages    |  7 +++-
 builder/stage4/04-pisdr-system/03-run.sh      | 18 ++++++++++
 .../stage4/04-pisdr-system/patch/ninja.patch  |  6 ++++
 .../stage4/05-pisdr-gnuradio/00-packages-nr   | 29 ---------------
 builder/stage4/05-pisdr-gnuradio/00-run.sh    | 35 -------------------
 builder/stage4/05-pisdr-uhd/00-packages-nr    |  3 ++
 builder/stage4/05-pisdr-uhd/00-run.sh         | 21 +++++++++++
 .../stage4/06-pisdr-gnuradio/00-packages-nr   | 32 +++++++++++++++++
 builder/stage4/06-pisdr-gnuradio/00-run.sh    | 20 +++++++++++
 .../stage4/07-pisdr-limesdr/00-packages-nr    |  3 --
 builder/stage4/07-pisdr-limesdr/00-run.sh     |  4 +--
 builder/stage4/07-pisdr-limesdr/01-run.sh     |  5 +--
 builder/stage4/08-pisdr-airspy/00-run.sh      |  4 +--
 builder/stage4/08-pisdr-airspy/01-run.sh      |  8 ++---
 builder/stage4/08-pisdr-airspy/02-run.sh      |  8 ++---
 builder/stage4/08-pisdr-airspy/03-run.sh      |  8 ++---
 builder/stage4/09-pisdr-rtlsdr/00-run.sh      |  4 +--
 builder/stage4/09-pisdr-rtlsdr/01-run.sh      |  4 +--
 .../stage4/10-pisdr-plutosdr/00-packages-nr   |  1 -
 builder/stage4/10-pisdr-plutosdr/00-run.sh    |  4 +--
 builder/stage4/10-pisdr-plutosdr/01-run.sh    |  4 +--
 builder/stage4/10-pisdr-plutosdr/02-run.sh    |  5 +--
 builder/stage4/10-pisdr-plutosdr/03-run.sh    |  4 +--
 builder/stage4/11-pisdr-hackrf/00-run.sh      |  4 +--
 builder/stage4/11-pisdr-hackrf/01-run.sh      |  4 +--
 builder/stage4/12-pisdr-osmocom/00-run.sh     |  7 ++--
 builder/stage4/13-pisdr-gqrx/00-packages-nr   |  4 ---
 builder/stage4/13-pisdr-gqrx/00-run.sh        |  6 ++--
 builder/stage4/15-pisdr-rtl443/00-run.sh      |  4 +--
 .../stage4/16-pisdr-sdrangel/00-packages-nr   |  4 ---
 builder/stage4/16-pisdr-sdrangel/00-run.sh    |  4 +--
 builder/stage4/16-pisdr-sdrangel/01-run.sh    |  4 +--
 builder/stage4/16-pisdr-sdrangel/02-run.sh    |  4 +--
 builder/stage4/16-pisdr-sdrangel/03-run.sh    |  4 +--
 builder/stage4/16-pisdr-sdrangel/04-run.sh    |  4 +--
 builder/stage4/16-pisdr-sdrangel/05-run.sh    |  4 +--
 builder/stage4/17-pisdr-libacars/00-run.sh    |  4 +--
 builder/stage4/18-pisdr-acarsdec/00-run.sh    |  4 +--
 builder/stage4/19-pisdr-multimonng/00-run.sh  |  4 +--
 .../00-packages-nr                            |  3 --
 .../01-run.sh                                 |  4 +--
 .../02-run.sh                                 |  4 +--
 .../03-run.sh                                 |  7 ++--
 .../00-run.sh                                 |  0
 45 files changed, 186 insertions(+), 162 deletions(-)
 create mode 100755 builder/stage4/04-pisdr-system/03-run.sh
 create mode 100644 builder/stage4/04-pisdr-system/patch/ninja.patch
 delete mode 100644 builder/stage4/05-pisdr-gnuradio/00-packages-nr
 delete mode 100755 builder/stage4/05-pisdr-gnuradio/00-run.sh
 create mode 100644 builder/stage4/05-pisdr-uhd/00-packages-nr
 create mode 100755 builder/stage4/05-pisdr-uhd/00-run.sh
 create mode 100644 builder/stage4/06-pisdr-gnuradio/00-packages-nr
 create mode 100755 builder/stage4/06-pisdr-gnuradio/00-run.sh
 rename builder/stage4/{06-pisdr-soapysdr => 23-pisdr-soapysdr}/00-packages-nr (60%)
 rename builder/stage4/{06-pisdr-soapysdr => 23-pisdr-soapysdr}/01-run.sh (87%)
 rename builder/stage4/{06-pisdr-soapysdr => 23-pisdr-soapysdr}/02-run.sh (88%)
 rename builder/stage4/{06-pisdr-soapysdr => 23-pisdr-soapysdr}/03-run.sh (82%)
 rename builder/stage4/{23-pisdr-virgo => 25-pisdr-virgo}/00-run.sh (100%)

diff --git a/builder/build.sh b/builder/build.sh
index 755b0c4..1d65bed 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -20,11 +20,13 @@ EOF
 			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages-nr")"
 			if [ -n "$PACKAGES" ]; then
 				on_chroot << EOF
-apt-get -m --ignore-missing --fix-missing install --no-install-recommends -y $PACKAGES || true
-sleep 25
-apt-get -m --ignore-missing --fix-missing install --no-install-recommends -y $PACKAGES || true
-sleep 25
-apt-get --ignore-missing --fix-missing install --no-install-recommends -y $PACKAGES
+n=0
+until [ "$n" -ge 5 ]
+do
+    apt-get --ignore-missing --fix-missing install --no-install-recommends -y $PACKAGES && break
+    n=$((n+1))
+    sleep 15
+done
 EOF
 			fi
 			log "End ${SUB_STAGE_DIR}/${i}-packages-nr"
@@ -34,11 +36,13 @@ EOF
 			PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages")"
 			if [ -n "$PACKAGES" ]; then
 				on_chroot << EOF
-apt-get -m --ignore-missing --fix-missing install -y $PACKAGES || true
-sleep 25
-apt-get -m --ignore-missing --fix-missing install -y $PACKAGES || true
-sleep 25
-apt-get --ignore-missing --fix-missing install -y $PACKAGES
+n=0
+until [ "$n" -ge 5 ]
+do
+    apt-get --ignore-missing --fix-missing install -y $PACKAGES && break
+    n=$((n+1))
+    sleep 15
+done
 EOF
 			fi
 			log "End ${SUB_STAGE_DIR}/${i}-packages"
diff --git a/builder/stage4/04-pisdr-system/00-packages b/builder/stage4/04-pisdr-system/00-packages
index 7485a06..9a84486 100644
--- a/builder/stage4/04-pisdr-system/00-packages
+++ b/builder/stage4/04-pisdr-system/00-packages
@@ -1,2 +1,7 @@
 vim
-tmux
\ No newline at end of file
+tmux
+cmake
+build-essential
+git
+pkg-config
+re2c
diff --git a/builder/stage4/04-pisdr-system/03-run.sh b/builder/stage4/04-pisdr-system/03-run.sh
new file mode 100755
index 0000000..406fc8f
--- /dev/null
+++ b/builder/stage4/04-pisdr-system/03-run.sh
@@ -0,0 +1,18 @@
+#!/bin/bash -e
+
+install -m 755 patch/ninja.patch "${ROOTFS_DIR}/etc/"
+
+on_chroot << EOF
+cd "/tmp"
+
+if [ ! -d "ninja" ]; then
+    git clone https://github.com/ninja-build/ninja.git
+    cd ninja
+    patch -u CMakeLists.txt -i /etc/ninja.patch
+    mkdir -p build
+    cd build
+    cmake -DCMAKE_BUILD_TYPE=Release ..
+    make -j$(nproc) install
+    ldconfig
+fi
+EOF
diff --git a/builder/stage4/04-pisdr-system/patch/ninja.patch b/builder/stage4/04-pisdr-system/patch/ninja.patch
new file mode 100644
index 0000000..3bf0c96
--- /dev/null
+++ b/builder/stage4/04-pisdr-system/patch/ninja.patch
@@ -0,0 +1,6 @@
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.15)
++cmake_minimum_required(VERSION 3.13)
+ project(ninja)
+
+ # --- optional link-time optimization
diff --git a/builder/stage4/05-pisdr-gnuradio/00-packages-nr b/builder/stage4/05-pisdr-gnuradio/00-packages-nr
deleted file mode 100644
index c858e2e..0000000
--- a/builder/stage4/05-pisdr-gnuradio/00-packages-nr
+++ /dev/null
@@ -1,29 +0,0 @@
-cmake
-git
-g++
-libboost-all-dev
-swig
-libzmq3-dev
-libfftw3-dev
-libgsl-dev
-libcppunit-dev
-libcomedi-dev
-libqt4-opengl-dev
-libqwt-dev
-libsdl1.2-dev
-libusb-1.0-0-dev
-pkg-config
-libasound2-dev
-pulseaudio
-libjack-dev
-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
deleted file mode 100755
index fe4ff70..0000000
--- a/builder/stage4/05-pisdr-gnuradio/00-run.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
-cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
-
-if [ ! -d "volk" ]; then
-    git clone --recursive https://github.com/gnuradio/volk.git
-fi
-
-cd volk
-mkdir -p build
-cd build
-cmake -DCMAKE_BUILD_TYPE=Release ../
-make -j$(nproc) install
-ldconfig
-EOF
-
-on_chroot << EOF
-mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
-cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
-
-if [ ! -d "gnuradio" ]; then
-    git clone --recursive https://github.com/gnuradio/gnuradio.git
-fi
-
-cd gnuradio
-git checkout maint-3.7
-mkdir -p build
-cd build
-cmake -DENABLE_INTERNAL_VOLK=OFF -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python ../
-make -j$(nproc) install
-ldconfig
-EOF
-
diff --git a/builder/stage4/05-pisdr-uhd/00-packages-nr b/builder/stage4/05-pisdr-uhd/00-packages-nr
new file mode 100644
index 0000000..b4768c0
--- /dev/null
+++ b/builder/stage4/05-pisdr-uhd/00-packages-nr
@@ -0,0 +1,3 @@
+libboost-all-dev
+libusb-1.0-0-dev
+python3-mako
diff --git a/builder/stage4/05-pisdr-uhd/00-run.sh b/builder/stage4/05-pisdr-uhd/00-run.sh
new file mode 100755
index 0000000..e0b4488
--- /dev/null
+++ b/builder/stage4/05-pisdr-uhd/00-run.sh
@@ -0,0 +1,21 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "uhd" ]; then
+    git clone https://github.com/EttusResearch/uhd.git
+fi
+
+cd uhd/host
+mkdir -p build
+cd build
+cmake -DCMAKE_CXX_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a15 -Wno-psabi" \
+      -DCMAKE_C_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a15 -Wno-psabi" \
+      -DCMAKE_ASM_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a15" \
+      -GNinja -DCMAKE_BUILD_TYPE=Release ../
+ninja install
+ldconfig
+EOF
+
diff --git a/builder/stage4/06-pisdr-gnuradio/00-packages-nr b/builder/stage4/06-pisdr-gnuradio/00-packages-nr
new file mode 100644
index 0000000..87daf88
--- /dev/null
+++ b/builder/stage4/06-pisdr-gnuradio/00-packages-nr
@@ -0,0 +1,32 @@
+libboost-all-dev
+swig
+libzmq3-dev
+libfftw3-dev
+libgsl-dev
+libcppunit-dev
+libcomedi-dev
+libqt4-opengl-dev
+libqwt-dev
+libsdl1.2-dev
+libusb-1.0-0-dev
+libasound2-dev
+pulseaudio
+libjack-dev
+libgmp-dev
+libsdl1.2-dev
+liblog4cpp5-dev
+libqwt-qt5-dev
+libqt5opengl5-dev
+
+python3-numpy
+python3-mako
+python3-sphinx
+python3-lxml
+python3-pyqt5
+python3-yaml
+python3-click
+python3-click-plugins
+python3-zmq
+python3-scipy
+python3-pip
+python3-gi-cairo
diff --git a/builder/stage4/06-pisdr-gnuradio/00-run.sh b/builder/stage4/06-pisdr-gnuradio/00-run.sh
new file mode 100755
index 0000000..e32df0a
--- /dev/null
+++ b/builder/stage4/06-pisdr-gnuradio/00-run.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "gnuradio" ]; then
+    git clone --recursive https://github.com/gnuradio/gnuradio.git
+fi
+
+cd gnuradio
+git checkout maint-3.8
+git submodule update --init --recursive
+mkdir -p build
+cd build
+cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python3 ../
+ninja
+ldconfig
+EOF
+
diff --git a/builder/stage4/07-pisdr-limesdr/00-packages-nr b/builder/stage4/07-pisdr-limesdr/00-packages-nr
index 89b3aed..1420797 100644
--- a/builder/stage4/07-pisdr-limesdr/00-packages-nr
+++ b/builder/stage4/07-pisdr-limesdr/00-packages-nr
@@ -1,7 +1,4 @@
-git
-g++
 swig
-cmake
 libsqlite3-dev
 libi2c-dev
 libusb-1.0-0-dev
diff --git a/builder/stage4/07-pisdr-limesdr/00-run.sh b/builder/stage4/07-pisdr-limesdr/00-run.sh
index bad6631..d23cb80 100755
--- a/builder/stage4/07-pisdr-limesdr/00-run.sh
+++ b/builder/stage4/07-pisdr-limesdr/00-run.sh
@@ -11,8 +11,8 @@ fi
 cd LimeSuite
 mkdir -p build
 cd build
-cmake -DCMAKE_CXX_FLAGS=-latomic ../
-make -j$(nproc) install
+cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ../
+ninja
 ldconfig
 
 cd ../udev-rules
diff --git a/builder/stage4/07-pisdr-limesdr/01-run.sh b/builder/stage4/07-pisdr-limesdr/01-run.sh
index bb77907..baba46a 100755
--- a/builder/stage4/07-pisdr-limesdr/01-run.sh
+++ b/builder/stage4/07-pisdr-limesdr/01-run.sh
@@ -9,9 +9,10 @@ if [ ! -d "gr-limesdr" ]; then
 fi
 
 cd gr-limesdr
+git checkout gr-3.8
 mkdir -p build
 cd build
-cmake -DCMAKE_CXX_FLAGS=-latomic ../
-make -j$(nproc) install
+cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ../
+ninja
 ldconfig
 EOF
diff --git a/builder/stage4/08-pisdr-airspy/00-run.sh b/builder/stage4/08-pisdr-airspy/00-run.sh
index d00c212..64350dc 100755
--- a/builder/stage4/08-pisdr-airspy/00-run.sh
+++ b/builder/stage4/08-pisdr-airspy/00-run.sh
@@ -11,7 +11,7 @@ fi
 cd airspyone_host
 mkdir -p build
 cd build
-cmake ../ -DINSTALL_UDEV_RULES=ON
-make -j$(nproc) install
+cmake -GNinja -DINSTALL_UDEV_RULES=ON ..
+ninja
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/08-pisdr-airspy/01-run.sh b/builder/stage4/08-pisdr-airspy/01-run.sh
index 748f79a..c1e4796 100755
--- a/builder/stage4/08-pisdr-airspy/01-run.sh
+++ b/builder/stage4/08-pisdr-airspy/01-run.sh
@@ -11,9 +11,7 @@ fi
 cd airspyhf
 mkdir -p build
 cd build
-cmake ../ -DINSTALL_UDEV_RULES=ON
-make -j$(nproc) install
+cmake -GNinja -DINSTALL_UDEV_RULES=ON .. 
+ninja install
 ldconfig
-EOF
-
-
+EOF
\ No newline at end of file
diff --git a/builder/stage4/08-pisdr-airspy/02-run.sh b/builder/stage4/08-pisdr-airspy/02-run.sh
index 091a5ea..a74f9e5 100755
--- a/builder/stage4/08-pisdr-airspy/02-run.sh
+++ b/builder/stage4/08-pisdr-airspy/02-run.sh
@@ -11,9 +11,7 @@ fi
 cd SoapyAirspy
 mkdir -p build
 cd build
-cmake -DCMAKE_CXX_FLAGS=-latomic ../
-make -j$(nproc) install
+cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ..
+ninja install
 ldconfig
-EOF
-
-
+EOF
\ No newline at end of file
diff --git a/builder/stage4/08-pisdr-airspy/03-run.sh b/builder/stage4/08-pisdr-airspy/03-run.sh
index b2f4795..6585439 100755
--- a/builder/stage4/08-pisdr-airspy/03-run.sh
+++ b/builder/stage4/08-pisdr-airspy/03-run.sh
@@ -11,9 +11,7 @@ fi
 cd SoapyAirspyHF
 mkdir -p build
 cd build
-cmake -DCMAKE_CXX_FLAGS=-latomic ../
-make -j$(nproc) install
+cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ..
+ninja install
 ldconfig
-EOF
-
-
+EOF
\ No newline at end of file
diff --git a/builder/stage4/09-pisdr-rtlsdr/00-run.sh b/builder/stage4/09-pisdr-rtlsdr/00-run.sh
index 6c0f138..eb1d4b1 100755
--- a/builder/stage4/09-pisdr-rtlsdr/00-run.sh
+++ b/builder/stage4/09-pisdr-rtlsdr/00-run.sh
@@ -11,7 +11,7 @@ fi
 cd rtl-sdr
 mkdir -p build
 cd build
-cmake ../ -DINSTALL_UDEV_RULES=ON -DDETACH_KERNEL_DRIVER=ON
-make -j$(nproc) install
+cmake -GNinja -DINSTALL_UDEV_RULES=ON -DDETACH_KERNEL_DRIVER=ON ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/09-pisdr-rtlsdr/01-run.sh b/builder/stage4/09-pisdr-rtlsdr/01-run.sh
index bd8cba0..410adba 100755
--- a/builder/stage4/09-pisdr-rtlsdr/01-run.sh
+++ b/builder/stage4/09-pisdr-rtlsdr/01-run.sh
@@ -11,7 +11,7 @@ fi
 cd SoapyRTLSDR
 mkdir -p build
 cd build
-cmake -DCMAKE_CXX_FLAGS=-latomic ../
-make -j$(nproc) install
+cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/10-pisdr-plutosdr/00-packages-nr b/builder/stage4/10-pisdr-plutosdr/00-packages-nr
index 16ba9db..ee6471b 100644
--- a/builder/stage4/10-pisdr-plutosdr/00-packages-nr
+++ b/builder/stage4/10-pisdr-plutosdr/00-packages-nr
@@ -2,7 +2,6 @@ libxml2-dev
 bison
 flex
 libcdk5-dev
-cmake
 libaio-dev
 libusb-1.0-0-dev
 libserialport-dev
diff --git a/builder/stage4/10-pisdr-plutosdr/00-run.sh b/builder/stage4/10-pisdr-plutosdr/00-run.sh
index 4f07c36..e759b14 100755
--- a/builder/stage4/10-pisdr-plutosdr/00-run.sh
+++ b/builder/stage4/10-pisdr-plutosdr/00-run.sh
@@ -11,7 +11,7 @@ fi
 cd libiio
 mkdir -p build
 cd build
-cmake ../ -DINSTALL_UDEV_RULE=ON
-make -j$(nproc) install
+cmake -GNinja -DINSTALL_UDEV_RULE=ON ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/10-pisdr-plutosdr/01-run.sh b/builder/stage4/10-pisdr-plutosdr/01-run.sh
index 6da1572..8c7b039 100755
--- a/builder/stage4/10-pisdr-plutosdr/01-run.sh
+++ b/builder/stage4/10-pisdr-plutosdr/01-run.sh
@@ -11,7 +11,7 @@ fi
 cd libad9361-iio
 mkdir -p build
 cd build
-cmake ../ -DINSTALL_UDEV_RULE=ON
-make -j$(nproc) install
+cmake -GNinja -DINSTALL_UDEV_RULE=ON ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/10-pisdr-plutosdr/02-run.sh b/builder/stage4/10-pisdr-plutosdr/02-run.sh
index 9dd40ff..972833c 100755
--- a/builder/stage4/10-pisdr-plutosdr/02-run.sh
+++ b/builder/stage4/10-pisdr-plutosdr/02-run.sh
@@ -9,9 +9,10 @@ if [ ! -d "gr-iio" ]; then
 fi
 
 cd gr-iio
+git checkout upgrade-3.8
 mkdir -p build
 cd build
-cmake ../ -DINSTALL_UDEV_RULE=ON
-make -j$(nproc) install
+cmake -GNinja -DINSTALL_UDEV_RULE=ON ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/10-pisdr-plutosdr/03-run.sh b/builder/stage4/10-pisdr-plutosdr/03-run.sh
index 0fa6e00..2dcf524 100755
--- a/builder/stage4/10-pisdr-plutosdr/03-run.sh
+++ b/builder/stage4/10-pisdr-plutosdr/03-run.sh
@@ -11,7 +11,7 @@ fi
 cd SoapyPlutoSDR
 mkdir -p build
 cd build
-cmake -DCMAKE_CXX_FLAGS=-latomic ../
-make -j$(nproc) install
+cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/11-pisdr-hackrf/00-run.sh b/builder/stage4/11-pisdr-hackrf/00-run.sh
index e4388a0..3248f30 100755
--- a/builder/stage4/11-pisdr-hackrf/00-run.sh
+++ b/builder/stage4/11-pisdr-hackrf/00-run.sh
@@ -11,7 +11,7 @@ fi
 cd hackrf/host
 mkdir -p build
 cd build
-cmake ../ -DINSTALL_UDEV_RULES=ON
-make -j$(nproc) install
+cmake -GNinja -DINSTALL_UDEV_RULES=ON ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/11-pisdr-hackrf/01-run.sh b/builder/stage4/11-pisdr-hackrf/01-run.sh
index ee89917..51cd199 100755
--- a/builder/stage4/11-pisdr-hackrf/01-run.sh
+++ b/builder/stage4/11-pisdr-hackrf/01-run.sh
@@ -11,7 +11,7 @@ fi
 cd SoapyHackRF
 mkdir -p build
 cd build
-cmake -DCMAKE_CXX_FLAGS=-latomic ../
-make -j$(nproc) install
+cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/12-pisdr-osmocom/00-run.sh b/builder/stage4/12-pisdr-osmocom/00-run.sh
index 7833082..8489510 100755
--- a/builder/stage4/12-pisdr-osmocom/00-run.sh
+++ b/builder/stage4/12-pisdr-osmocom/00-run.sh
@@ -9,10 +9,9 @@ if [ ! -d "gr-osmosdr" ]; then
 fi
 
 cd gr-osmosdr
-git checkout gr3.7
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja install
 ldconfig
-EOF
\ No newline at end of file
+EOF
diff --git a/builder/stage4/13-pisdr-gqrx/00-packages-nr b/builder/stage4/13-pisdr-gqrx/00-packages-nr
index b4b6941..ea48125 100644
--- a/builder/stage4/13-pisdr-gqrx/00-packages-nr
+++ b/builder/stage4/13-pisdr-gqrx/00-packages-nr
@@ -1,7 +1,3 @@
-git
-cmake
-g++
-pkg-config
 autoconf
 automake
 libtool
diff --git a/builder/stage4/13-pisdr-gqrx/00-run.sh b/builder/stage4/13-pisdr-gqrx/00-run.sh
index 2d21b16..fd29abe 100755
--- a/builder/stage4/13-pisdr-gqrx/00-run.sh
+++ b/builder/stage4/13-pisdr-gqrx/00-run.sh
@@ -11,7 +11,7 @@ fi
 cd gqrx
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja install
 ldconfig
-EOF
\ No newline at end of file
+EOF
diff --git a/builder/stage4/15-pisdr-rtl443/00-run.sh b/builder/stage4/15-pisdr-rtl443/00-run.sh
index cbf3b4b..866ec6f 100755
--- a/builder/stage4/15-pisdr-rtl443/00-run.sh
+++ b/builder/stage4/15-pisdr-rtl443/00-run.sh
@@ -11,7 +11,7 @@ fi
 cd rtl_433
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/16-pisdr-sdrangel/00-packages-nr b/builder/stage4/16-pisdr-sdrangel/00-packages-nr
index eeece68..55d0f4c 100644
--- a/builder/stage4/16-pisdr-sdrangel/00-packages-nr
+++ b/builder/stage4/16-pisdr-sdrangel/00-packages-nr
@@ -1,7 +1,3 @@
-git
-cmake
-g++
-pkg-config
 autoconf
 automake
 libtool
diff --git a/builder/stage4/16-pisdr-sdrangel/00-run.sh b/builder/stage4/16-pisdr-sdrangel/00-run.sh
index 93319a2..e71d9a0 100755
--- a/builder/stage4/16-pisdr-sdrangel/00-run.sh
+++ b/builder/stage4/16-pisdr-sdrangel/00-run.sh
@@ -12,7 +12,7 @@ cd cm256cc
 git reset --hard c0e92b92aca3d1d36c990b642b937c64d363c559
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja
 ldconfig
 EOF
diff --git a/builder/stage4/16-pisdr-sdrangel/01-run.sh b/builder/stage4/16-pisdr-sdrangel/01-run.sh
index 2a073f8..9da7e93 100755
--- a/builder/stage4/16-pisdr-sdrangel/01-run.sh
+++ b/builder/stage4/16-pisdr-sdrangel/01-run.sh
@@ -12,7 +12,7 @@ cd mbelib
 git reset --hard 9a04ed5c78176a9965f3d43f7aa1b1f5330e771f
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/16-pisdr-sdrangel/02-run.sh b/builder/stage4/16-pisdr-sdrangel/02-run.sh
index 0451e78..796ef3d 100755
--- a/builder/stage4/16-pisdr-sdrangel/02-run.sh
+++ b/builder/stage4/16-pisdr-sdrangel/02-run.sh
@@ -12,7 +12,7 @@ cd serialDV
 git reset --hard "v1.1.4"
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/16-pisdr-sdrangel/03-run.sh b/builder/stage4/16-pisdr-sdrangel/03-run.sh
index f9d6075..2d565be 100755
--- a/builder/stage4/16-pisdr-sdrangel/03-run.sh
+++ b/builder/stage4/16-pisdr-sdrangel/03-run.sh
@@ -12,7 +12,7 @@ cd dsdcc
 git reset --hard "v1.9.0"
 mkdir -p build
 cd build
-cmake -DUSE_MBELIB=ON  ../
-make -j$(nproc) install
+cmake -GNinja -DUSE_MBELIB=ON  ..
+ninja install
 ldconfig
 EOF
diff --git a/builder/stage4/16-pisdr-sdrangel/04-run.sh b/builder/stage4/16-pisdr-sdrangel/04-run.sh
index 9b5ed19..2313f00 100755
--- a/builder/stage4/16-pisdr-sdrangel/04-run.sh
+++ b/builder/stage4/16-pisdr-sdrangel/04-run.sh
@@ -12,7 +12,7 @@ cd codec2
 git reset --hard 76a20416d715ee06f8b36a9953506876689a3bd2
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/16-pisdr-sdrangel/05-run.sh b/builder/stage4/16-pisdr-sdrangel/05-run.sh
index 8730701..845b6e5 100755
--- a/builder/stage4/16-pisdr-sdrangel/05-run.sh
+++ b/builder/stage4/16-pisdr-sdrangel/05-run.sh
@@ -11,7 +11,7 @@ fi
 cd sdrangel
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/17-pisdr-libacars/00-run.sh b/builder/stage4/17-pisdr-libacars/00-run.sh
index eae6d38..c290d35 100755
--- a/builder/stage4/17-pisdr-libacars/00-run.sh
+++ b/builder/stage4/17-pisdr-libacars/00-run.sh
@@ -11,7 +11,7 @@ fi
 cd libacars
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/18-pisdr-acarsdec/00-run.sh b/builder/stage4/18-pisdr-acarsdec/00-run.sh
index a0fbb41..9e86399 100755
--- a/builder/stage4/18-pisdr-acarsdec/00-run.sh
+++ b/builder/stage4/18-pisdr-acarsdec/00-run.sh
@@ -11,7 +11,7 @@ fi
 cd acarsdec
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/19-pisdr-multimonng/00-run.sh b/builder/stage4/19-pisdr-multimonng/00-run.sh
index b94b939..a76cc41 100755
--- a/builder/stage4/19-pisdr-multimonng/00-run.sh
+++ b/builder/stage4/19-pisdr-multimonng/00-run.sh
@@ -11,7 +11,7 @@ fi
 cd multimon-ng
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/06-pisdr-soapysdr/00-packages-nr b/builder/stage4/23-pisdr-soapysdr/00-packages-nr
similarity index 60%
rename from builder/stage4/06-pisdr-soapysdr/00-packages-nr
rename to builder/stage4/23-pisdr-soapysdr/00-packages-nr
index f123a42..d39cd18 100644
--- a/builder/stage4/06-pisdr-soapysdr/00-packages-nr
+++ b/builder/stage4/23-pisdr-soapysdr/00-packages-nr
@@ -1,7 +1,4 @@
-git
-g++
 swig
-cmake
 avahi-daemon
 libavahi-client-dev
 libusb-1.0-0-dev
diff --git a/builder/stage4/06-pisdr-soapysdr/01-run.sh b/builder/stage4/23-pisdr-soapysdr/01-run.sh
similarity index 87%
rename from builder/stage4/06-pisdr-soapysdr/01-run.sh
rename to builder/stage4/23-pisdr-soapysdr/01-run.sh
index 5623193..2ea8ac4 100755
--- a/builder/stage4/06-pisdr-soapysdr/01-run.sh
+++ b/builder/stage4/23-pisdr-soapysdr/01-run.sh
@@ -11,7 +11,7 @@ fi
 cd SoapySDR
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/06-pisdr-soapysdr/02-run.sh b/builder/stage4/23-pisdr-soapysdr/02-run.sh
similarity index 88%
rename from builder/stage4/06-pisdr-soapysdr/02-run.sh
rename to builder/stage4/23-pisdr-soapysdr/02-run.sh
index 077615f..dcbfe53 100755
--- a/builder/stage4/06-pisdr-soapysdr/02-run.sh
+++ b/builder/stage4/23-pisdr-soapysdr/02-run.sh
@@ -11,7 +11,7 @@ fi
 cd SoapyRemote
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/06-pisdr-soapysdr/03-run.sh b/builder/stage4/23-pisdr-soapysdr/03-run.sh
similarity index 82%
rename from builder/stage4/06-pisdr-soapysdr/03-run.sh
rename to builder/stage4/23-pisdr-soapysdr/03-run.sh
index ac31016..f99178e 100755
--- a/builder/stage4/06-pisdr-soapysdr/03-run.sh
+++ b/builder/stage4/23-pisdr-soapysdr/03-run.sh
@@ -9,10 +9,9 @@ if [ ! -d "gr-soapy" ]; then
 fi
 
 cd gr-soapy
-git checkout maint-3.7
 mkdir -p build
 cd build
-cmake ../
-make -j$(nproc) install
+cmake -GNinja ..
+ninja install
 ldconfig
-EOF
\ No newline at end of file
+EOF
diff --git a/builder/stage4/23-pisdr-virgo/00-run.sh b/builder/stage4/25-pisdr-virgo/00-run.sh
similarity index 100%
rename from builder/stage4/23-pisdr-virgo/00-run.sh
rename to builder/stage4/25-pisdr-virgo/00-run.sh