From bb8a7af46c0fefbdac84f1978f347339208f09e3 Mon Sep 17 00:00:00 2001
From: Luigi Cruz <luigifcruz@gmail.com>
Date: Thu, 3 Dec 2020 00:35:08 -0300
Subject: [PATCH] Version 5 (#39)

* Add airband and limesdr toolbox support

* Update validate.yml

* add osmo-fl2k support

* add hamlib support

* add vaportrail support

* add universal radio hacker support

* clone just latest code from git

* add dump1090 support

* add foxtelem support
---
 .github/workflows/validate.yml                |  2 +-
 builder/stage4/05-pisdr-uhd/00-run.sh         |  3 +--
 builder/stage4/06-pisdr-gnuradio/00-run.sh    |  3 +--
 builder/stage4/07-pisdr-soapysdr/01-run.sh    |  2 +-
 builder/stage4/07-pisdr-soapysdr/02-run.sh    |  2 +-
 builder/stage4/07-pisdr-soapysdr/03-run.sh    |  2 +-
 builder/stage4/08-pisdr-limesdr/00-run.sh     |  2 +-
 builder/stage4/08-pisdr-limesdr/01-run.sh     |  3 +--
 builder/stage4/09-pisdr-airspy/00-run.sh      |  2 +-
 builder/stage4/09-pisdr-airspy/01-run.sh      |  2 +-
 builder/stage4/09-pisdr-airspy/02-run.sh      |  2 +-
 builder/stage4/09-pisdr-airspy/03-run.sh      |  2 +-
 builder/stage4/10-pisdr-rtlsdr/00-run.sh      |  2 +-
 builder/stage4/10-pisdr-rtlsdr/01-run.sh      |  2 +-
 builder/stage4/11-pisdr-plutosdr/00-run.sh    |  2 +-
 builder/stage4/11-pisdr-plutosdr/01-run.sh    |  2 +-
 builder/stage4/11-pisdr-plutosdr/02-run.sh    |  3 +--
 builder/stage4/11-pisdr-plutosdr/03-run.sh    |  2 +-
 builder/stage4/12-pisdr-hackrf/01-run.sh      |  2 +-
 builder/stage4/13-pisdr-osmocom/00-run.sh     |  2 +-
 builder/stage4/14-pisdr-gqrx/00-run.sh        |  2 +-
 builder/stage4/15-pisdr-cygnusrf/00-run.sh    |  2 +-
 builder/stage4/16-pisdr-rtl443/00-run.sh      |  2 +-
 builder/stage4/17-pisdr-sdrangel/05-run.sh    |  2 +-
 builder/stage4/18-pisdr-libacars/00-run.sh    |  2 +-
 builder/stage4/19-pisdr-acarsdec/00-run.sh    |  2 +-
 builder/stage4/20-pisdr-multimonng/00-run.sh  |  2 +-
 builder/stage4/21-pisdr-hamlib/00-run.sh      | 16 ++++++++++++++++
 builder/stage4/22-pisdr-gpredict/00-run.sh    |  2 +-
 builder/stage4/23-pisdr-rpitx/00-run.sh       |  2 +-
 builder/stage4/24-pisdr-virgo/00-run.sh       |  2 +-
 .../stage4/26-pisdr-limesdr-toolbox/00-run.sh | 19 +++++++++++++++++++
 .../stage4/27-pisdr-airband/00-packages-nr    |  4 ++++
 builder/stage4/27-pisdr-airband/00-run.sh     | 16 ++++++++++++++++
 .../stage4/28-pisdr-osmo-fl2k/00-packages-nr  |  1 +
 builder/stage4/28-pisdr-osmo-fl2k/00-run.sh   | 19 +++++++++++++++++++
 .../00-run.sh                                 |  2 +-
 builder/stage4/30-pisdr-vaportrail/00-run.sh  | 16 ++++++++++++++++
 builder/stage4/31-pisdr-urh/00-run.sh         | 14 ++++++++++++++
 builder/stage4/32-pisdr-dump1090/00-run.sh    | 14 ++++++++++++++
 builder/stage4/32-pisdr-foxtelem/00-run.sh    | 12 ++++++++++++
 builder/stage4/35-pisdr-cleanup/00-run.sh     |  5 +++++
 .../00-run.sh => 35-pisdr-cleanup/01-run.sh}  |  0
 43 files changed, 167 insertions(+), 35 deletions(-)
 create mode 100755 builder/stage4/21-pisdr-hamlib/00-run.sh
 create mode 100755 builder/stage4/26-pisdr-limesdr-toolbox/00-run.sh
 create mode 100644 builder/stage4/27-pisdr-airband/00-packages-nr
 create mode 100755 builder/stage4/27-pisdr-airband/00-run.sh
 create mode 100644 builder/stage4/28-pisdr-osmo-fl2k/00-packages-nr
 create mode 100755 builder/stage4/28-pisdr-osmo-fl2k/00-run.sh
 rename builder/stage4/{21-pisdr-leandvb => 29-pisdr-leandvb}/00-run.sh (77%)
 create mode 100755 builder/stage4/30-pisdr-vaportrail/00-run.sh
 create mode 100755 builder/stage4/31-pisdr-urh/00-run.sh
 create mode 100755 builder/stage4/32-pisdr-dump1090/00-run.sh
 create mode 100755 builder/stage4/32-pisdr-foxtelem/00-run.sh
 create mode 100755 builder/stage4/35-pisdr-cleanup/00-run.sh
 rename builder/stage4/{26-pisdr-udev/00-run.sh => 35-pisdr-cleanup/01-run.sh} (100%)

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 1b37a18..efb6528 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -1,4 +1,4 @@
-on: ['pull_request', 'push']
+on: ['pull_request']
 
 name: Build & Validate Image
 
diff --git a/builder/stage4/05-pisdr-uhd/00-run.sh b/builder/stage4/05-pisdr-uhd/00-run.sh
index 4c31ddc..21f6e62 100755
--- a/builder/stage4/05-pisdr-uhd/00-run.sh
+++ b/builder/stage4/05-pisdr-uhd/00-run.sh
@@ -5,11 +5,10 @@ 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
+    git clone --single-branch --branch UHD-3.15.LTS --depth 1 https://github.com/EttusResearch/uhd.git
 fi
 
 cd uhd/host
-git checkout UHD-3.15.LTS
 mkdir -p build
 cd build
 cmake -DCMAKE_CXX_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a15 -Wno-psabi" \
diff --git a/builder/stage4/06-pisdr-gnuradio/00-run.sh b/builder/stage4/06-pisdr-gnuradio/00-run.sh
index 752f139..c615d12 100755
--- a/builder/stage4/06-pisdr-gnuradio/00-run.sh
+++ b/builder/stage4/06-pisdr-gnuradio/00-run.sh
@@ -5,11 +5,10 @@ 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
+    git clone --single-branch --branch maint-3.8 --depth 1 --recurse-submodules --shallow-submodules https://github.com/gnuradio/gnuradio.git
 fi
 
 cd gnuradio
-git checkout maint-3.8
 git submodule update --init --recursive
 mkdir -p build
 cd build
diff --git a/builder/stage4/07-pisdr-soapysdr/01-run.sh b/builder/stage4/07-pisdr-soapysdr/01-run.sh
index d002ead..adce589 100755
--- a/builder/stage4/07-pisdr-soapysdr/01-run.sh
+++ b/builder/stage4/07-pisdr-soapysdr/01-run.sh
@@ -5,7 +5,7 @@ mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 	    	"/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "SoapySDR" ]; then
-    git clone https://github.com/pothosware/SoapySDR.git
+    git clone --depth 1 https://github.com/pothosware/SoapySDR.git
 fi
 
 cd SoapySDR
diff --git a/builder/stage4/07-pisdr-soapysdr/02-run.sh b/builder/stage4/07-pisdr-soapysdr/02-run.sh
index 1f9db47..57637ff 100755
--- a/builder/stage4/07-pisdr-soapysdr/02-run.sh
+++ b/builder/stage4/07-pisdr-soapysdr/02-run.sh
@@ -5,7 +5,7 @@ mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 	    	"/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "SoapyRemote" ]; then
-    git clone https://github.com/pothosware/SoapyRemote.git
+    git clone --depth 1 https://github.com/pothosware/SoapyRemote.git
 fi
 
 cd SoapyRemote
diff --git a/builder/stage4/07-pisdr-soapysdr/03-run.sh b/builder/stage4/07-pisdr-soapysdr/03-run.sh
index 5a23746..cabe0f3 100755
--- a/builder/stage4/07-pisdr-soapysdr/03-run.sh
+++ b/builder/stage4/07-pisdr-soapysdr/03-run.sh
@@ -5,7 +5,7 @@ mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 	    	"/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "gr-soapy" ]; then
-    git clone https://gitlab.com/librespacefoundation/gr-soapy.git
+    git clone --depth 1 https://gitlab.com/librespacefoundation/gr-soapy.git
 fi
 
 cd gr-soapy
diff --git a/builder/stage4/08-pisdr-limesdr/00-run.sh b/builder/stage4/08-pisdr-limesdr/00-run.sh
index 5b3de8f..8db8e36 100755
--- a/builder/stage4/08-pisdr-limesdr/00-run.sh
+++ b/builder/stage4/08-pisdr-limesdr/00-run.sh
@@ -5,7 +5,7 @@ mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "LimeSuite" ]; then
-    git clone https://github.com/myriadrf/LimeSuite.git
+    git clone --depth 1 https://github.com/myriadrf/LimeSuite.git
 fi
 
 cd LimeSuite
diff --git a/builder/stage4/08-pisdr-limesdr/01-run.sh b/builder/stage4/08-pisdr-limesdr/01-run.sh
index d1abc53..70c3645 100755
--- a/builder/stage4/08-pisdr-limesdr/01-run.sh
+++ b/builder/stage4/08-pisdr-limesdr/01-run.sh
@@ -5,11 +5,10 @@ mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "gr-limesdr" ]; then
-    git clone https://github.com/myriadrf/gr-limesdr.git
+    git clone --single-branch --branch gr-3.8 --depth 1 https://github.com/myriadrf/gr-limesdr.git
 fi
 
 cd gr-limesdr
-git checkout gr-3.8
 mkdir -p build
 cd build
 cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ..
diff --git a/builder/stage4/09-pisdr-airspy/00-run.sh b/builder/stage4/09-pisdr-airspy/00-run.sh
index b7d6521..b1eef4c 100755
--- a/builder/stage4/09-pisdr-airspy/00-run.sh
+++ b/builder/stage4/09-pisdr-airspy/00-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "airspyone_host" ]; then
-    git clone https://github.com/airspy/airspyone_host.git
+    git clone --depth 1 https://github.com/airspy/airspyone_host.git
 fi
 
 cd airspyone_host
diff --git a/builder/stage4/09-pisdr-airspy/01-run.sh b/builder/stage4/09-pisdr-airspy/01-run.sh
index cc1a032..4f9a41a 100755
--- a/builder/stage4/09-pisdr-airspy/01-run.sh
+++ b/builder/stage4/09-pisdr-airspy/01-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "airspyhf" ]; then
-    git clone https://github.com/airspy/airspyhf.git
+    git clone --depth 1 https://github.com/airspy/airspyhf.git
 fi
 
 cd airspyhf
diff --git a/builder/stage4/09-pisdr-airspy/02-run.sh b/builder/stage4/09-pisdr-airspy/02-run.sh
index 3b71e61..d2f350d 100755
--- a/builder/stage4/09-pisdr-airspy/02-run.sh
+++ b/builder/stage4/09-pisdr-airspy/02-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "SoapyAirspy" ]; then
-    git clone https://github.com/pothosware/SoapyAirspy.git
+    git clone --depth 1 https://github.com/pothosware/SoapyAirspy.git
 fi
 
 cd SoapyAirspy
diff --git a/builder/stage4/09-pisdr-airspy/03-run.sh b/builder/stage4/09-pisdr-airspy/03-run.sh
index 577ea43..7944d8e 100755
--- a/builder/stage4/09-pisdr-airspy/03-run.sh
+++ b/builder/stage4/09-pisdr-airspy/03-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "SoapyAirspyHF" ]; then
-    git clone https://github.com/pothosware/SoapyAirspyHF.git
+    git clone --depth 1 https://github.com/pothosware/SoapyAirspyHF.git
 fi
 
 cd SoapyAirspyHF
diff --git a/builder/stage4/10-pisdr-rtlsdr/00-run.sh b/builder/stage4/10-pisdr-rtlsdr/00-run.sh
index 730835e..20d37e1 100755
--- a/builder/stage4/10-pisdr-rtlsdr/00-run.sh
+++ b/builder/stage4/10-pisdr-rtlsdr/00-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "rtl-sdr" ]; then
-    git clone https://github.com/osmocom/rtl-sdr
+    git clone --depth 1 https://github.com/osmocom/rtl-sdr
 fi
 
 cd rtl-sdr
diff --git a/builder/stage4/10-pisdr-rtlsdr/01-run.sh b/builder/stage4/10-pisdr-rtlsdr/01-run.sh
index 720793e..a3ce6ea 100755
--- a/builder/stage4/10-pisdr-rtlsdr/01-run.sh
+++ b/builder/stage4/10-pisdr-rtlsdr/01-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "SoapyRTLSDR" ]; then
-    git clone https://github.com/pothosware/SoapyRTLSDR.git
+    git clone --depth 1 https://github.com/pothosware/SoapyRTLSDR.git
 fi
 
 cd SoapyRTLSDR
diff --git a/builder/stage4/11-pisdr-plutosdr/00-run.sh b/builder/stage4/11-pisdr-plutosdr/00-run.sh
index 81509a2..f99ad7d 100755
--- a/builder/stage4/11-pisdr-plutosdr/00-run.sh
+++ b/builder/stage4/11-pisdr-plutosdr/00-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "libiio" ]; then
-    git clone https://github.com/analogdevicesinc/libiio
+    git clone --depth 1 https://github.com/analogdevicesinc/libiio
 fi
 
 cd libiio
diff --git a/builder/stage4/11-pisdr-plutosdr/01-run.sh b/builder/stage4/11-pisdr-plutosdr/01-run.sh
index b24ae2d..6565e39 100755
--- a/builder/stage4/11-pisdr-plutosdr/01-run.sh
+++ b/builder/stage4/11-pisdr-plutosdr/01-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "libad9361-iio" ]; then
-    git clone https://github.com/analogdevicesinc/libad9361-iio
+    git clone --depth 1 https://github.com/analogdevicesinc/libad9361-iio
 fi
 
 cd libad9361-iio
diff --git a/builder/stage4/11-pisdr-plutosdr/02-run.sh b/builder/stage4/11-pisdr-plutosdr/02-run.sh
index 955ca2e..5507565 100755
--- a/builder/stage4/11-pisdr-plutosdr/02-run.sh
+++ b/builder/stage4/11-pisdr-plutosdr/02-run.sh
@@ -5,11 +5,10 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "gr-iio" ]; then
-    git clone https://github.com/analogdevicesinc/gr-iio
+    git clone --single-branch --branch upgrade-3.8 --depth 1 https://github.com/analogdevicesinc/gr-iio
 fi
 
 cd gr-iio
-git checkout upgrade-3.8
 mkdir -p build
 cd build
 cmake -GNinja -DINSTALL_UDEV_RULE=ON ..
diff --git a/builder/stage4/11-pisdr-plutosdr/03-run.sh b/builder/stage4/11-pisdr-plutosdr/03-run.sh
index 9d227bb..d4f9b9c 100755
--- a/builder/stage4/11-pisdr-plutosdr/03-run.sh
+++ b/builder/stage4/11-pisdr-plutosdr/03-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "SoapyPlutoSDR" ]; then
-    git clone https://github.com/pothosware/SoapyPlutoSDR.git
+    git clone --depth 1 https://github.com/pothosware/SoapyPlutoSDR.git
 fi
 
 cd SoapyPlutoSDR
diff --git a/builder/stage4/12-pisdr-hackrf/01-run.sh b/builder/stage4/12-pisdr-hackrf/01-run.sh
index 83f7367..f3d8c8a 100755
--- a/builder/stage4/12-pisdr-hackrf/01-run.sh
+++ b/builder/stage4/12-pisdr-hackrf/01-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Radios"
 
 if [ ! -d "SoapyHackRF" ]; then
-    git clone https://github.com/pothosware/SoapyHackRF.git
+    git clone --depth 1 https://github.com/pothosware/SoapyHackRF.git
 fi
 
 cd SoapyHackRF
diff --git a/builder/stage4/13-pisdr-osmocom/00-run.sh b/builder/stage4/13-pisdr-osmocom/00-run.sh
index b7fc6e0..4a0a9ab 100755
--- a/builder/stage4/13-pisdr-osmocom/00-run.sh
+++ b/builder/stage4/13-pisdr-osmocom/00-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "gr-osmosdr" ]; then
-    git clone git://git.osmocom.org/gr-osmosdr
+    git clone --depth 1 git://git.osmocom.org/gr-osmosdr
 fi
 
 cd gr-osmosdr
diff --git a/builder/stage4/14-pisdr-gqrx/00-run.sh b/builder/stage4/14-pisdr-gqrx/00-run.sh
index e3be7d2..337b2b0 100755
--- a/builder/stage4/14-pisdr-gqrx/00-run.sh
+++ b/builder/stage4/14-pisdr-gqrx/00-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "gqrx" ]; then
-    git clone https://github.com/csete/gqrx.git
+    git clone --depth 1 https://github.com/csete/gqrx.git
 fi
 
 cd gqrx
diff --git a/builder/stage4/15-pisdr-cygnusrf/00-run.sh b/builder/stage4/15-pisdr-cygnusrf/00-run.sh
index dffb193..b473cb8 100755
--- a/builder/stage4/15-pisdr-cygnusrf/00-run.sh
+++ b/builder/stage4/15-pisdr-cygnusrf/00-run.sh
@@ -5,6 +5,6 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "CygnusRFI" ]; then
-    git clone https://github.com/0xCoto/CygnusRFI
+    git clone --depth 1 https://github.com/0xCoto/CygnusRFI
 fi
 EOF
\ No newline at end of file
diff --git a/builder/stage4/16-pisdr-rtl443/00-run.sh b/builder/stage4/16-pisdr-rtl443/00-run.sh
index 4e15b8e..00e350d 100755
--- a/builder/stage4/16-pisdr-rtl443/00-run.sh
+++ b/builder/stage4/16-pisdr-rtl443/00-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "rtl_433" ]; then
-    git clone https://github.com/merbanan/rtl_433.git
+    git clone --depth 1 https://github.com/merbanan/rtl_433.git
 fi
 
 cd rtl_433
diff --git a/builder/stage4/17-pisdr-sdrangel/05-run.sh b/builder/stage4/17-pisdr-sdrangel/05-run.sh
index d98207d..d8fbcbd 100755
--- a/builder/stage4/17-pisdr-sdrangel/05-run.sh
+++ b/builder/stage4/17-pisdr-sdrangel/05-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "sdrangel" ]; then
-    git clone https://github.com/f4exb/sdrangel.git
+    git clone --depth 1 https://github.com/f4exb/sdrangel.git
 fi
 
 cd sdrangel
diff --git a/builder/stage4/18-pisdr-libacars/00-run.sh b/builder/stage4/18-pisdr-libacars/00-run.sh
index f9c781d..ad9dfa4 100755
--- a/builder/stage4/18-pisdr-libacars/00-run.sh
+++ b/builder/stage4/18-pisdr-libacars/00-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "libacars" ]; then
-    git clone https://github.com/szpajder/libacars.git
+    git clone --depth 1 https://github.com/szpajder/libacars.git
 fi
 
 cd libacars
diff --git a/builder/stage4/19-pisdr-acarsdec/00-run.sh b/builder/stage4/19-pisdr-acarsdec/00-run.sh
index 86ab2b8..a449920 100755
--- a/builder/stage4/19-pisdr-acarsdec/00-run.sh
+++ b/builder/stage4/19-pisdr-acarsdec/00-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "acarsdec" ]; then
-    git clone https://github.com/TLeconte/acarsdec.git
+    git clone --depth 1 https://github.com/TLeconte/acarsdec.git
 fi
 
 cd acarsdec
diff --git a/builder/stage4/20-pisdr-multimonng/00-run.sh b/builder/stage4/20-pisdr-multimonng/00-run.sh
index 718544b..00a1ade 100755
--- a/builder/stage4/20-pisdr-multimonng/00-run.sh
+++ b/builder/stage4/20-pisdr-multimonng/00-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "multimon-ng" ]; then
-    git clone https://github.com/EliasOenal/multimon-ng.git
+    git clone --depth 1 https://github.com/EliasOenal/multimon-ng.git
 fi
 
 cd multimon-ng
diff --git a/builder/stage4/21-pisdr-hamlib/00-run.sh b/builder/stage4/21-pisdr-hamlib/00-run.sh
new file mode 100755
index 0000000..37f2164
--- /dev/null
+++ b/builder/stage4/21-pisdr-hamlib/00-run.sh
@@ -0,0 +1,16 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "Hamlib" ]; then
+    git clone --depth 1 https://github.com/Hamlib/Hamlib.git
+fi
+
+cd Hamlib
+./bootstrap
+./configure --with-python-binding
+make -j$(nproc)
+ldconfig
+EOF
\ No newline at end of file
diff --git a/builder/stage4/22-pisdr-gpredict/00-run.sh b/builder/stage4/22-pisdr-gpredict/00-run.sh
index 8091d36..805f6a0 100755
--- a/builder/stage4/22-pisdr-gpredict/00-run.sh
+++ b/builder/stage4/22-pisdr-gpredict/00-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "gpredict" ]; then
-    git clone https://github.com/csete/gpredict.git
+    git clone --depth 1 https://github.com/csete/gpredict.git
 fi
 
 cd gpredict
diff --git a/builder/stage4/23-pisdr-rpitx/00-run.sh b/builder/stage4/23-pisdr-rpitx/00-run.sh
index 34fb936..1c5d25e 100755
--- a/builder/stage4/23-pisdr-rpitx/00-run.sh
+++ b/builder/stage4/23-pisdr-rpitx/00-run.sh
@@ -5,6 +5,6 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "rpitx" ]; then
-    git clone https://github.com/F5OEO/rpitx.git
+    git clone --depth 1 https://github.com/F5OEO/rpitx.git
 fi
 EOF
\ No newline at end of file
diff --git a/builder/stage4/24-pisdr-virgo/00-run.sh b/builder/stage4/24-pisdr-virgo/00-run.sh
index b4ca02a..7b627e4 100755
--- a/builder/stage4/24-pisdr-virgo/00-run.sh
+++ b/builder/stage4/24-pisdr-virgo/00-run.sh
@@ -5,6 +5,6 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "VIRGO" ]; then
-    git clone https://github.com/0xCoto/VIRGO
+    git clone --depth 1 https://github.com/0xCoto/VIRGO
 fi
 EOF
\ No newline at end of file
diff --git a/builder/stage4/26-pisdr-limesdr-toolbox/00-run.sh b/builder/stage4/26-pisdr-limesdr-toolbox/00-run.sh
new file mode 100755
index 0000000..0fee978
--- /dev/null
+++ b/builder/stage4/26-pisdr-limesdr-toolbox/00-run.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "limesdr_toolbox" ]; then
+    git clone --depth 1 https://github.com/emvivre/limesdr_toolbox.git
+fi
+
+cd limesdr_toolbox
+mkdir -p build
+cd build
+cmake -GNinja ..
+ninja install
+ldconfig
+cd ..
+rm -fr build
+EOF
\ No newline at end of file
diff --git a/builder/stage4/27-pisdr-airband/00-packages-nr b/builder/stage4/27-pisdr-airband/00-packages-nr
new file mode 100644
index 0000000..3faf9d6
--- /dev/null
+++ b/builder/stage4/27-pisdr-airband/00-packages-nr
@@ -0,0 +1,4 @@
+libmp3lame-dev
+libshout3-dev
+libconfig++-dev
+libraspberrypi-dev
diff --git a/builder/stage4/27-pisdr-airband/00-run.sh b/builder/stage4/27-pisdr-airband/00-run.sh
new file mode 100755
index 0000000..6232adb
--- /dev/null
+++ b/builder/stage4/27-pisdr-airband/00-run.sh
@@ -0,0 +1,16 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "RTLSDR-Airband" ]; then
+    git clone --depth 1 https://github.com/szpajder/RTLSDR-Airband.git
+fi
+
+cd RTLSDR-Airband
+export PLATFORM=armv7-generic
+export WITH_SOAPYSDR=1
+make install
+ldconfig
+EOF
\ No newline at end of file
diff --git a/builder/stage4/28-pisdr-osmo-fl2k/00-packages-nr b/builder/stage4/28-pisdr-osmo-fl2k/00-packages-nr
new file mode 100644
index 0000000..10c35a2
--- /dev/null
+++ b/builder/stage4/28-pisdr-osmo-fl2k/00-packages-nr
@@ -0,0 +1 @@
+libusb-1.0-0-dev
\ No newline at end of file
diff --git a/builder/stage4/28-pisdr-osmo-fl2k/00-run.sh b/builder/stage4/28-pisdr-osmo-fl2k/00-run.sh
new file mode 100755
index 0000000..10266f2
--- /dev/null
+++ b/builder/stage4/28-pisdr-osmo-fl2k/00-run.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "osmo-fl2k" ]; then
+    git clone --depth 1 git://git.osmocom.org/osmo-fl2k.git
+fi
+
+cd osmo-fl2k
+mkdir -p build
+cd build
+cmake -GNinja -DINSTALL_UDEV_RULES=ON ..
+ninja install
+ldconfig
+cd ..
+rm -fr build
+EOF
\ No newline at end of file
diff --git a/builder/stage4/21-pisdr-leandvb/00-run.sh b/builder/stage4/29-pisdr-leandvb/00-run.sh
similarity index 77%
rename from builder/stage4/21-pisdr-leandvb/00-run.sh
rename to builder/stage4/29-pisdr-leandvb/00-run.sh
index 6192260..6167891 100755
--- a/builder/stage4/21-pisdr-leandvb/00-run.sh
+++ b/builder/stage4/29-pisdr-leandvb/00-run.sh
@@ -5,7 +5,7 @@ mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
 if [ ! -d "leansdr" ]; then
-    git clone https://github.com/pabr/leansdr.git
+    git clone --depth 1 https://github.com/pabr/leansdr.git
 fi
 
 cd leansdr/src/apps
diff --git a/builder/stage4/30-pisdr-vaportrail/00-run.sh b/builder/stage4/30-pisdr-vaportrail/00-run.sh
new file mode 100755
index 0000000..d6c0bee
--- /dev/null
+++ b/builder/stage4/30-pisdr-vaportrail/00-run.sh
@@ -0,0 +1,16 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "vaportrail" ]; then
+    mkdir -p vaportrail
+fi
+
+cd vaportrail
+wget https://github.com/inguardians/VaporTrail/releases/download/0.1.0/vaportrail-rpi2-and-rpi3.tar.gz
+tar -xvzf vaportrail-rpi2-and-rpi3.tar.gz
+cp vaportrail /usr/bin/
+rm *.tar.gz
+EOF
\ No newline at end of file
diff --git a/builder/stage4/31-pisdr-urh/00-run.sh b/builder/stage4/31-pisdr-urh/00-run.sh
new file mode 100755
index 0000000..116c3b7
--- /dev/null
+++ b/builder/stage4/31-pisdr-urh/00-run.sh
@@ -0,0 +1,14 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "urh" ]; then
+    git clone --depth 1 https://github.com/jopohl/urh.git
+fi
+
+cd urh
+python3 -m pip install --upgrade cython
+python3 setup.py install
+EOF
\ No newline at end of file
diff --git a/builder/stage4/32-pisdr-dump1090/00-run.sh b/builder/stage4/32-pisdr-dump1090/00-run.sh
new file mode 100755
index 0000000..f82d95b
--- /dev/null
+++ b/builder/stage4/32-pisdr-dump1090/00-run.sh
@@ -0,0 +1,14 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "dump1090" ]; then
+    git clone --depth 1 https://github.com/antirez/dump1090.git
+fi
+
+cd dump1090
+make -j$(nproc)
+cp dump1090 /usr/bin/   
+EOF
\ No newline at end of file
diff --git a/builder/stage4/32-pisdr-foxtelem/00-run.sh b/builder/stage4/32-pisdr-foxtelem/00-run.sh
new file mode 100755
index 0000000..c3aff6a
--- /dev/null
+++ b/builder/stage4/32-pisdr-foxtelem/00-run.sh
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "FoxTelem" ]; then
+    wget http://amsat.us/FoxTelem/linux/FoxTelem_1.08z5_linux.tar.gz
+    tar -xvzf  FoxTelem_1.08z5_linux.tar.gz
+    mv FoxTelem_1.08z5_linux FoxTelem
+fi
+EOF
\ No newline at end of file
diff --git a/builder/stage4/35-pisdr-cleanup/00-run.sh b/builder/stage4/35-pisdr-cleanup/00-run.sh
new file mode 100755
index 0000000..08af436
--- /dev/null
+++ b/builder/stage4/35-pisdr-cleanup/00-run.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+sudo ln -s /usr/local/lib/python3/dist-packages/* /usr/lib/python3/dist-packages || true
+EOF
\ No newline at end of file
diff --git a/builder/stage4/26-pisdr-udev/00-run.sh b/builder/stage4/35-pisdr-cleanup/01-run.sh
similarity index 100%
rename from builder/stage4/26-pisdr-udev/00-run.sh
rename to builder/stage4/35-pisdr-cleanup/01-run.sh