From 2b70ef4575b1b74fa25eea0da01492c11ccc4a15 Mon Sep 17 00:00:00 2001
From: Luigi Cruz <luigifcruz@gmail.com>
Date: Mon, 17 Feb 2020 22:51:20 -0300
Subject: [PATCH] Fixing bash scripts.

---
 builder/stage1/00-boot-files/files/config.txt |  4 +--
 .../00-run.sh                                 |  0
 .../00-run.sh                                 |  1 -
 builder/stage4/05-pisdr-gnuradio/00-packages  | 25 +++++++++++++++++++
 builder/stage4/05-pisdr-gnuradio/00-run.sh    | 20 +++++++++++++++
 builder/stage4/05-pisdr-system/00-packages    |  1 -
 builder/stage4/06-pisdr-soapysdr/01-run.sh    |  7 +++---
 builder/stage4/06-pisdr-soapysdr/02-run.sh    |  7 +++---
 builder/stage4/06-pisdr-soapysdr/03-run.sh    | 19 ++++++++++++++
 builder/stage4/07-pisdr-limesdr/00-run.sh     | 13 +++++-----
 builder/stage4/07-pisdr-limesdr/01-run.sh     |  7 +++---
 builder/stage4/08-pisdr-airspy/00-run.sh      |  7 +++---
 builder/stage4/08-pisdr-airspy/01-run.sh      |  7 +++---
 builder/stage4/08-pisdr-airspy/02-run.sh      |  7 +++---
 builder/stage4/09-pisdr-rtlsdr/00-run.sh      |  7 +++---
 builder/stage4/09-pisdr-rtlsdr/01-run.sh      |  7 +++---
 builder/stage4/10-pisdr-plutosdr/00-run.sh    |  7 +++---
 builder/stage4/10-pisdr-plutosdr/01-run.sh    |  7 +++---
 builder/stage4/10-pisdr-plutosdr/02-run.sh    |  7 +++---
 builder/stage4/10-pisdr-plutosdr/03-run.sh    |  7 +++---
 builder/stage4/11-pisdr-sdrangel/00-run.sh    |  7 +++---
 builder/stage4/11-pisdr-sdrangel/01-run.sh    |  7 +++---
 builder/stage4/11-pisdr-sdrangel/02-run.sh    |  7 +++---
 builder/stage4/11-pisdr-sdrangel/03-run.sh    |  7 +++---
 builder/stage4/11-pisdr-sdrangel/04-run.sh    |  7 +++---
 builder/stage4/11-pisdr-sdrangel/05-run.sh    | 19 ++++++++++++++
 builder/stage4/12-pisdr-gqrx/00-packages      | 25 +++++++++++++++++++
 builder/stage4/12-pisdr-gqrx/00-run.sh        | 19 ++++++++++++++
 builder/stage4/13-pisdr-osmocom/00-run.sh     | 20 +++++++++++++++
 29 files changed, 206 insertions(+), 79 deletions(-)
 rename builder/stage4/{04-enable-xcompmgr => 03-enable-xcompmgr}/00-run.sh (100%)
 rename builder/stage4/{05-pisdr-system => 04-pisdr-system}/00-run.sh (81%)
 create mode 100644 builder/stage4/05-pisdr-gnuradio/00-packages
 create mode 100755 builder/stage4/05-pisdr-gnuradio/00-run.sh
 delete mode 100644 builder/stage4/05-pisdr-system/00-packages
 create mode 100755 builder/stage4/06-pisdr-soapysdr/03-run.sh
 create mode 100644 builder/stage4/12-pisdr-gqrx/00-packages
 create mode 100755 builder/stage4/12-pisdr-gqrx/00-run.sh
 create mode 100644 builder/stage4/13-pisdr-osmocom/00-run.sh

diff --git a/builder/stage1/00-boot-files/files/config.txt b/builder/stage1/00-boot-files/files/config.txt
index 548f4ac..1494cdc 100644
--- a/builder/stage1/00-boot-files/files/config.txt
+++ b/builder/stage1/00-boot-files/files/config.txt
@@ -18,8 +18,8 @@
 
 # uncomment to force a console size. By default it will be display's size minus
 # overscan.
-#framebuffer_width=1280
-#framebuffer_height=720
+#framebuffer_width=1920
+#framebuffer_height=1080
 
 # uncomment if hdmi display is not detected and composite is being output
 #hdmi_force_hotplug=1
diff --git a/builder/stage4/04-enable-xcompmgr/00-run.sh b/builder/stage4/03-enable-xcompmgr/00-run.sh
similarity index 100%
rename from builder/stage4/04-enable-xcompmgr/00-run.sh
rename to builder/stage4/03-enable-xcompmgr/00-run.sh
diff --git a/builder/stage4/05-pisdr-system/00-run.sh b/builder/stage4/04-pisdr-system/00-run.sh
similarity index 81%
rename from builder/stage4/05-pisdr-system/00-run.sh
rename to builder/stage4/04-pisdr-system/00-run.sh
index ce91245..0afb84b 100755
--- a/builder/stage4/05-pisdr-system/00-run.sh
+++ b/builder/stage4/04-pisdr-system/00-run.sh
@@ -1,6 +1,5 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-## Turn on VNC
 systemctl enable vncserver-x11-serviced.service
 EOF
\ No newline at end of file
diff --git a/builder/stage4/05-pisdr-gnuradio/00-packages b/builder/stage4/05-pisdr-gnuradio/00-packages
new file mode 100644
index 0000000..dabf4dc
--- /dev/null
+++ b/builder/stage4/05-pisdr-gnuradio/00-packages
@@ -0,0 +1,25 @@
+cmake
+git
+g++
+libboost-all-dev
+python-dev
+python-mako
+python-numpy
+python-wxgtk3.0
+python-sphinx
+python-cheetah
+swig
+libzmq3-dev
+libfftw3-dev
+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
diff --git a/builder/stage4/05-pisdr-gnuradio/00-run.sh b/builder/stage4/05-pisdr-gnuradio/00-run.sh
new file mode 100755
index 0000000..07266c5
--- /dev/null
+++ b/builder/stage4/05-pisdr-gnuradio/00-run.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p 	"/home/${FIRST_USER_NAME}/LimeSDR"
+cd 		    "/home/${FIRST_USER_NAME}/LimeSDR"
+
+if [ ! -d "gnuradio" ]; then
+    git clone --recursive https://github.com/gnuradio/gnuradio.git
+fi
+
+cd gnuradio
+git pull
+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 ../
+make -j$(nproc) install
+ldconfig
+EOF
diff --git a/builder/stage4/05-pisdr-system/00-packages b/builder/stage4/05-pisdr-system/00-packages
deleted file mode 100644
index b51eb16..0000000
--- a/builder/stage4/05-pisdr-system/00-packages
+++ /dev/null
@@ -1 +0,0 @@
-gnuradio
\ No newline at end of file
diff --git a/builder/stage4/06-pisdr-soapysdr/01-run.sh b/builder/stage4/06-pisdr-soapysdr/01-run.sh
index 76feac0..5dfca45 100755
--- a/builder/stage4/06-pisdr-soapysdr/01-run.sh
+++ b/builder/stage4/06-pisdr-soapysdr/01-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 on_chroot << EOF
-mkdir -p 	"${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Packages"
-cd 	    	"${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Packages"
+mkdir -p 	"/home/${FIRST_USER_NAME}/Packages"
+cd 	    	"/home/${FIRST_USER_NAME}/Packages"
 
 if [ ! -d "SoapySDR" ]; then
     git clone https://github.com/pothosware/SoapySDR.git
@@ -14,7 +14,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake ../
-make -j$(nproc)
-make install
+make -j$(nproc) install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/06-pisdr-soapysdr/02-run.sh b/builder/stage4/06-pisdr-soapysdr/02-run.sh
index cd96595..b396c02 100755
--- a/builder/stage4/06-pisdr-soapysdr/02-run.sh
+++ b/builder/stage4/06-pisdr-soapysdr/02-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 on_chroot << EOF
-mkdir -p 	"${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Packages"
-cd 	    	"${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Packages"
+mkdir -p 	"/home/${FIRST_USER_NAME}/Packages"
+cd 	    	"/home/${FIRST_USER_NAME}/Packages"
 
 if [ ! -d "SoapyRemote" ]; then
     git clone https://github.com/pothosware/SoapyRemote.git
@@ -14,7 +14,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake ../
-make -j$(nproc)
-make install
+make -j$(nproc) install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/06-pisdr-soapysdr/03-run.sh b/builder/stage4/06-pisdr-soapysdr/03-run.sh
new file mode 100755
index 0000000..355d326
--- /dev/null
+++ b/builder/stage4/06-pisdr-soapysdr/03-run.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+on_chroot << EOF
+mkdir -p 	"/home/${FIRST_USER_NAME}/Packages"
+cd 	    	"/home/${FIRST_USER_NAME}/Packages"
+
+if [ ! -d "gr-soapy" ]; then
+    git clone https://gitlab.com/librespacefoundation/gr-soapy.git
+fi
+
+cd gr-soapy
+git pull
+mkdir -p build
+cd build
+rm -rf CMakeCache.txt
+cmake ../
+make -j$(nproc) install
+ldconfig
+EOF
\ No newline at end of file
diff --git a/builder/stage4/07-pisdr-limesdr/00-run.sh b/builder/stage4/07-pisdr-limesdr/00-run.sh
index 498b8a2..38431e0 100755
--- a/builder/stage4/07-pisdr-limesdr/00-run.sh
+++ b/builder/stage4/07-pisdr-limesdr/00-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p 	"${ROOTFS_DIR}/home/${FIRST_USER_NAME}/LimeSDR"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/LimeSDR"
+mkdir -p 	"/home/${FIRST_USER_NAME}/LimeSDR"
+cd 		    "/home/${FIRST_USER_NAME}/LimeSDR"
 
 if [ ! -d "LimeSuite" ]; then
     git clone https://github.com/myriadrf/LimeSuite.git
@@ -13,11 +13,10 @@ git pull
 mkdir -p build
 cd build
 rm -rf CMakeCache.txt
-cmake -DENABLE_SPI=ON -DCMAKE_CXX_LINK_FLAGS="$(DCMAKE_CXX_LINK_FLAGS) -latomic" ../
-make -j$(nproc)
-make install
+cmake -DCMAKE_CXX_LINK_FLAGS="$(DCMAKE_CXX_LINK_FLAGS) -latomic" ../
+make -j$(nproc) install
 ldconfig
 
-cd ..
-./udev-rules/install.sh
+cd ../udev-rules
+./install.sh
 EOF
diff --git a/builder/stage4/07-pisdr-limesdr/01-run.sh b/builder/stage4/07-pisdr-limesdr/01-run.sh
index 8b5139f..1658893 100755
--- a/builder/stage4/07-pisdr-limesdr/01-run.sh
+++ b/builder/stage4/07-pisdr-limesdr/01-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p 	"${ROOTFS_DIR}/home/${FIRST_USER_NAME}/LimeSDR"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/LimeSDR"
+mkdir -p 	"/home/${FIRST_USER_NAME}/LimeSDR"
+cd 		    "/home/${FIRST_USER_NAME}/LimeSDR"
 
 if [ ! -d "gr-limesdr" ]; then
     git clone https://github.com/myriadrf/gr-limesdr.git
@@ -14,7 +14,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake ../
-make -j$(nproc)
-make install
+make -j$(nproc) install
 ldconfig
 EOF
diff --git a/builder/stage4/08-pisdr-airspy/00-run.sh b/builder/stage4/08-pisdr-airspy/00-run.sh
index 5dc0526..4595ca8 100755
--- a/builder/stage4/08-pisdr-airspy/00-run.sh
+++ b/builder/stage4/08-pisdr-airspy/00-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Airspy"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Airspy"
+mkdir -p    "/home/${FIRST_USER_NAME}/Airspy"
+cd 		    "/home/${FIRST_USER_NAME}/Airspy"
 
 if [ ! -d "airspyone_host" ]; then
     git clone https://github.com/airspy/airspyone_host.git
@@ -14,7 +14,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake ../ -DINSTALL_UDEV_RULES=ON
-make -j$(nproc)
-make install
+make -j$(nproc) install
 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 81ececb..4fff743 100755
--- a/builder/stage4/08-pisdr-airspy/01-run.sh
+++ b/builder/stage4/08-pisdr-airspy/01-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Airspy"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Airspy"
+mkdir -p    "/home/${FIRST_USER_NAME}/Airspy"
+cd 		    "/home/${FIRST_USER_NAME}/Airspy"
 
 if [ ! -d "airspyhf" ]; then
     git clone https://github.com/airspy/airspyhf.git
@@ -14,8 +14,7 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake ../ -DINSTALL_UDEV_RULES=ON
-make -j$(nproc)
-make install
+make -j$(nproc) install
 ldconfig
 EOF
 
diff --git a/builder/stage4/08-pisdr-airspy/02-run.sh b/builder/stage4/08-pisdr-airspy/02-run.sh
index 83519dc..14dcd33 100755
--- a/builder/stage4/08-pisdr-airspy/02-run.sh
+++ b/builder/stage4/08-pisdr-airspy/02-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Airspy"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Airspy"
+mkdir -p    "/home/${FIRST_USER_NAME}/Airspy"
+cd 		    "/home/${FIRST_USER_NAME}/Airspy"
 
 if [ ! -d "SoapyAirspy" ]; then
     git clone https://github.com/pothosware/SoapyAirspy.git
@@ -14,8 +14,7 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake -DCMAKE_CXX_FLAGS=-latomic ../
-make -j$(nproc)
-make install
+make -j$(nproc) install
 ldconfig
 EOF
 
diff --git a/builder/stage4/09-pisdr-rtlsdr/00-run.sh b/builder/stage4/09-pisdr-rtlsdr/00-run.sh
index 44b882c..498fd30 100755
--- a/builder/stage4/09-pisdr-rtlsdr/00-run.sh
+++ b/builder/stage4/09-pisdr-rtlsdr/00-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/RTLSDR"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/RTLSDR"
+mkdir -p    "/home/${FIRST_USER_NAME}/RTLSDR"
+cd 		    "/home/${FIRST_USER_NAME}/RTLSDR"
 
 if [ ! -d "rtl-sdr" ]; then
     git clone https://github.com/osmocom/rtl-sdr
@@ -14,7 +14,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake ../ -DINSTALL_UDEV_RULES=ON -DDETACH_KERNEL_DRIVER=ON
-make -j$(nproc)
-make install
+make -j$(nproc) 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 dac7176..33ce2f5 100755
--- a/builder/stage4/09-pisdr-rtlsdr/01-run.sh
+++ b/builder/stage4/09-pisdr-rtlsdr/01-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/RTLSDR"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/RTLSDR"
+mkdir -p    "/home/${FIRST_USER_NAME}/RTLSDR"
+cd 		    "/home/${FIRST_USER_NAME}/RTLSDR"
 
 if [ ! -d "SoapyRTLSDR" ]; then
     git clone https://github.com/pothosware/SoapyRTLSDR.git
@@ -14,7 +14,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake -DCMAKE_CXX_FLAGS=-latomic ../
-make -j$(nproc)
-make install
+make -j$(nproc) install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/10-pisdr-plutosdr/00-run.sh b/builder/stage4/10-pisdr-plutosdr/00-run.sh
index 3fd0232..f6c4d6b 100755
--- a/builder/stage4/10-pisdr-plutosdr/00-run.sh
+++ b/builder/stage4/10-pisdr-plutosdr/00-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/PlutoSDR"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/PlutoSDR"
+mkdir -p    "/home/${FIRST_USER_NAME}/PlutoSDR"
+cd 		    "/home/${FIRST_USER_NAME}/PlutoSDR"
 
 if [ ! -d "libiio" ]; then
     git clone https://github.com/analogdevicesinc/libiio
@@ -14,7 +14,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake ../ -DINSTALL_UDEV_RULE=ON
-make -j$(nproc)
-make install
+make -j$(nproc) 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 f117364..a9aef6a 100755
--- a/builder/stage4/10-pisdr-plutosdr/01-run.sh
+++ b/builder/stage4/10-pisdr-plutosdr/01-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/PlutoSDR"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/PlutoSDR"
+mkdir -p    "/home/${FIRST_USER_NAME}/PlutoSDR"
+cd 		    "/home/${FIRST_USER_NAME}/PlutoSDR"
 
 if [ ! -d "libad9361-iio" ]; then
     git clone https://github.com/analogdevicesinc/libad9361-iio
@@ -14,7 +14,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake ../ -DINSTALL_UDEV_RULE=ON
-make -j$(nproc)
-make install
+make -j$(nproc) 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 85be305..99597e2 100755
--- a/builder/stage4/10-pisdr-plutosdr/02-run.sh
+++ b/builder/stage4/10-pisdr-plutosdr/02-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/PlutoSDR"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/PlutoSDR"
+mkdir -p    "/home/${FIRST_USER_NAME}/PlutoSDR"
+cd 		    "/home/${FIRST_USER_NAME}/PlutoSDR"
 
 if [ ! -d "gr-iio" ]; then
     git clone https://github.com/analogdevicesinc/gr-iio
@@ -14,7 +14,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake ../ -DINSTALL_UDEV_RULE=ON
-make -j$(nproc)
-make install
+make -j$(nproc) 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 eab11c8..7d1f3d4 100755
--- a/builder/stage4/10-pisdr-plutosdr/03-run.sh
+++ b/builder/stage4/10-pisdr-plutosdr/03-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/PlutoSDR"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/PlutoSDR"
+mkdir -p    "/home/${FIRST_USER_NAME}/PlutoSDR"
+cd 		    "/home/${FIRST_USER_NAME}/PlutoSDR"
 
 if [ ! -d "SoapyPlutoSDR" ]; then
     git clone https://github.com/pothosware/SoapyPlutoSDR.git
@@ -14,7 +14,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake -DCMAKE_CXX_FLAGS=-latomic ../
-make -j$(nproc)
-make install
+make -j$(nproc) install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/11-pisdr-sdrangel/00-run.sh b/builder/stage4/11-pisdr-sdrangel/00-run.sh
index 8943cfc..241d339 100755
--- a/builder/stage4/11-pisdr-sdrangel/00-run.sh
+++ b/builder/stage4/11-pisdr-sdrangel/00-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Software"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Software"
+mkdir -p    "/home/${FIRST_USER_NAME}/Software"
+cd 		    "/home/${FIRST_USER_NAME}/Software"
 
 if [ ! -d "cm256cc" ]; then
     git clone https://github.com/f4exb/cm256cc.git
@@ -15,7 +15,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake ../
-make -j$(nproc)
-make install
+make -j$(nproc) install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/11-pisdr-sdrangel/01-run.sh b/builder/stage4/11-pisdr-sdrangel/01-run.sh
index fd684f0..f49a589 100755
--- a/builder/stage4/11-pisdr-sdrangel/01-run.sh
+++ b/builder/stage4/11-pisdr-sdrangel/01-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Software"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Software"
+mkdir -p    "/home/${FIRST_USER_NAME}/Software"
+cd 		    "/home/${FIRST_USER_NAME}/Software"
 
 if [ ! -d "mbelib" ]; then
     git clone https://github.com/szechyjs/mbelib.git
@@ -15,7 +15,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake ../
-make -j$(nproc)
-make install
+make -j$(nproc) install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/11-pisdr-sdrangel/02-run.sh b/builder/stage4/11-pisdr-sdrangel/02-run.sh
index 061c2bd..5bd1763 100755
--- a/builder/stage4/11-pisdr-sdrangel/02-run.sh
+++ b/builder/stage4/11-pisdr-sdrangel/02-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Software"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Software"
+mkdir -p    "/home/${FIRST_USER_NAME}/Software"
+cd 		    "/home/${FIRST_USER_NAME}/Software"
 
 if [ ! -d "serialDV" ]; then
     git clone https://github.com/f4exb/serialDV.git
@@ -15,7 +15,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake ../
-make -j$(nproc)
-make install
+make -j$(nproc) install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/11-pisdr-sdrangel/03-run.sh b/builder/stage4/11-pisdr-sdrangel/03-run.sh
index 1d03f9e..a24f11b 100755
--- a/builder/stage4/11-pisdr-sdrangel/03-run.sh
+++ b/builder/stage4/11-pisdr-sdrangel/03-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Software"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Software"
+mkdir -p    "/home/${FIRST_USER_NAME}/Software"
+cd 		    "/home/${FIRST_USER_NAME}/Software"
 
 if [ ! -d "dsdcc" ]; then
     git clone https://github.com/f4exb/dsdcc.git
@@ -15,7 +15,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake -DUSE_MBELIB=ON  ../
-make -j$(nproc)
-make install
+make -j$(nproc) install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/11-pisdr-sdrangel/04-run.sh b/builder/stage4/11-pisdr-sdrangel/04-run.sh
index 33a726b..613e528 100755
--- a/builder/stage4/11-pisdr-sdrangel/04-run.sh
+++ b/builder/stage4/11-pisdr-sdrangel/04-run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-mkdir -p    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Software"
-cd 		    "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Software"
+mkdir -p    "/home/${FIRST_USER_NAME}/Software"
+cd 		    "/home/${FIRST_USER_NAME}/Software"
 
 if [ ! -d "codec2" ]; then
     git clone https://github.com/drowe67/codec2.git
@@ -15,7 +15,6 @@ mkdir -p build
 cd build
 rm -rf CMakeCache.txt
 cmake ../
-make -j$(nproc)
-make install
+make -j$(nproc) install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/11-pisdr-sdrangel/05-run.sh b/builder/stage4/11-pisdr-sdrangel/05-run.sh
index e69de29..7b97b26 100755
--- a/builder/stage4/11-pisdr-sdrangel/05-run.sh
+++ b/builder/stage4/11-pisdr-sdrangel/05-run.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/Software"
+cd 		    "/home/${FIRST_USER_NAME}/Software"
+
+if [ ! -d "sdrangel" ]; then
+    git clone https://github.com/f4exb/sdrangel.git
+fi
+
+cd sdrangel
+git pull
+mkdir -p build
+cd build
+rm -rf CMakeCache.txt
+cmake ../
+make -j$(nproc) install
+ldconfig
+EOF
\ No newline at end of file
diff --git a/builder/stage4/12-pisdr-gqrx/00-packages b/builder/stage4/12-pisdr-gqrx/00-packages
new file mode 100644
index 0000000..96ebb9f
--- /dev/null
+++ b/builder/stage4/12-pisdr-gqrx/00-packages
@@ -0,0 +1,25 @@
+git
+cmake
+g++
+pkg-config
+autoconf
+automake
+libtool
+libfftw3-dev
+libusb-1.0-0-dev
+libusb-dev
+qt5-default
+qtbase5-dev
+qtchooser
+libqt5multimedia5-plugins
+qtmultimedia5-dev
+libqt5websockets5-dev
+qttools5-dev
+qttools5-dev-tools
+libqt5opengl5-dev
+qtbase5-dev
+libboost-all-dev
+libasound2-dev
+pulseaudio
+libopencv-dev
+libxml2-dev
\ No newline at end of file
diff --git a/builder/stage4/12-pisdr-gqrx/00-run.sh b/builder/stage4/12-pisdr-gqrx/00-run.sh
new file mode 100755
index 0000000..8db7d46
--- /dev/null
+++ b/builder/stage4/12-pisdr-gqrx/00-run.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/Software"
+cd 		    "/home/${FIRST_USER_NAME}/Software"
+
+if [ ! -d "gqrx" ]; then
+    git clone https://github.com/csete/gqrx.git
+fi
+
+cd gqrx
+git pull
+mkdir -p build
+cd build
+rm -rf CMakeCache.txt
+cmake ../
+make -j$(nproc) install
+ldconfig
+EOF
\ No newline at end of file
diff --git a/builder/stage4/13-pisdr-osmocom/00-run.sh b/builder/stage4/13-pisdr-osmocom/00-run.sh
new file mode 100644
index 0000000..b1aa545
--- /dev/null
+++ b/builder/stage4/13-pisdr-osmocom/00-run.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/Software"
+cd 		    "/home/${FIRST_USER_NAME}/Software"
+
+if [ ! -d "gr-osmosdr" ]; then
+    git clone git://git.osmocom.org/gr-osmosdr
+fi
+
+cd gr-osmosdr
+git pull
+git checkout gr3.7
+mkdir -p build
+cd build
+rm -rf CMakeCache.txt
+cmake ../
+make -j$(nproc) install
+ldconfig
+EOF
\ No newline at end of file