From 08763d31be9198774ffaa3a2fd3ba72b512c3ed7 Mon Sep 17 00:00:00 2001 From: Luigi Cruz Date: Mon, 17 Aug 2020 14:47:40 -0300 Subject: [PATCH] Delete build dir after install. --- .../stage4/00-install-packages/00-packages | 4 +-- .../stage4/00-install-packages/01-packages | 26 +++---------------- .../stage4/00-install-packages/02-packages | 4 --- builder/stage4/05-pisdr-uhd/00-run.sh | 2 ++ builder/stage4/06-pisdr-gnuradio/00-run.sh | 2 ++ 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 | 4 ++- builder/stage4/08-pisdr-limesdr/01-run.sh | 2 ++ 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 | 2 ++ builder/stage4/11-pisdr-plutosdr/03-run.sh | 2 ++ builder/stage4/12-pisdr-hackrf/00-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/16-pisdr-rtl443/00-run.sh | 2 ++ builder/stage4/17-pisdr-sdrangel/00-run.sh | 2 ++ builder/stage4/17-pisdr-sdrangel/01-run.sh | 2 ++ builder/stage4/17-pisdr-sdrangel/02-run.sh | 2 ++ builder/stage4/17-pisdr-sdrangel/03-run.sh | 2 ++ builder/stage4/17-pisdr-sdrangel/04-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/26-pisdr-udev/00-run.sh | 1 + 35 files changed, 69 insertions(+), 30 deletions(-) delete mode 100644 builder/stage4/00-install-packages/02-packages diff --git a/builder/stage4/00-install-packages/00-packages b/builder/stage4/00-install-packages/00-packages index f9f5ef4..80f1a91 100644 --- a/builder/stage4/00-install-packages/00-packages +++ b/builder/stage4/00-install-packages/00-packages @@ -1,4 +1,4 @@ -python python3-pygame python-pygame python-tk +python python-tk python3 python3-tk thonny python3-pgzero python-serial python3-serial @@ -13,11 +13,9 @@ tree libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr geany piclone -wiringpi pigpio python-pigpio python3-pigpio raspi-gpio python-gpiozero python3-gpiozero python3-rpi.gpio python-spidev python3-spidev python-twython python3-twython python-smbus python3-smbus -python-flask python3-flask pprompt piwiz rp-prefapps diff --git a/builder/stage4/00-install-packages/01-packages b/builder/stage4/00-install-packages/01-packages index fdf5e73..fc43d17 100644 --- a/builder/stage4/00-install-packages/01-packages +++ b/builder/stage4/00-install-packages/01-packages @@ -1,22 +1,4 @@ -python-automationhat python3-automationhat -python-blinkt python3-blinkt -python-cap1xxx python3-cap1xxx -python-drumhat python3-drumhat -python-envirophat python3-envirophat -python-explorerhat python3-explorerhat -python-fourletterphat python3-fourletterphat -python-microdotphat python3-microdotphat -python-mote python3-mote -python-motephat python3-motephat -python-phatbeat python3-phatbeat -python-pianohat python3-pianohat -python-piglow python3-piglow -python-rainbowhat python3-rainbowhat -python-scrollphat python3-scrollphat -python-scrollphathd python3-scrollphathd -python-sn3218 python3-sn3218 -python-skywriter python3-skywriter -python-touchphat python3-touchphat -python-buttonshim python3-buttonshim -python-unicornhathd python3-unicornhathd -python-pantilthat python3-pantilthat +hunspell-en-gb +hyphen-en-gb +wamerican +wbritish diff --git a/builder/stage4/00-install-packages/02-packages b/builder/stage4/00-install-packages/02-packages deleted file mode 100644 index fc43d17..0000000 --- a/builder/stage4/00-install-packages/02-packages +++ /dev/null @@ -1,4 +0,0 @@ -hunspell-en-gb -hyphen-en-gb -wamerican -wbritish diff --git a/builder/stage4/05-pisdr-uhd/00-run.sh b/builder/stage4/05-pisdr-uhd/00-run.sh index ad5feb3..4c31ddc 100755 --- a/builder/stage4/05-pisdr-uhd/00-run.sh +++ b/builder/stage4/05-pisdr-uhd/00-run.sh @@ -20,4 +20,6 @@ ninja install cp /usr/local/lib/uhd/utils/uhd-usrp.rules /etc/udev/rules.d/ ldconfig uhd_images_downloader +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/06-pisdr-gnuradio/00-run.sh b/builder/stage4/06-pisdr-gnuradio/00-run.sh index e53db93..752f139 100755 --- a/builder/stage4/06-pisdr-gnuradio/00-run.sh +++ b/builder/stage4/06-pisdr-gnuradio/00-run.sh @@ -16,4 +16,6 @@ cd build cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/07-pisdr-soapysdr/01-run.sh b/builder/stage4/07-pisdr-soapysdr/01-run.sh index 2ea8ac4..d002ead 100755 --- a/builder/stage4/07-pisdr-soapysdr/01-run.sh +++ b/builder/stage4/07-pisdr-soapysdr/01-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/07-pisdr-soapysdr/02-run.sh b/builder/stage4/07-pisdr-soapysdr/02-run.sh index dcbfe53..1f9db47 100755 --- a/builder/stage4/07-pisdr-soapysdr/02-run.sh +++ b/builder/stage4/07-pisdr-soapysdr/02-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/07-pisdr-soapysdr/03-run.sh b/builder/stage4/07-pisdr-soapysdr/03-run.sh index f99178e..5a23746 100755 --- a/builder/stage4/07-pisdr-soapysdr/03-run.sh +++ b/builder/stage4/07-pisdr-soapysdr/03-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja .. ninja install ldconfig +cd .. +rm -fr build EOF diff --git a/builder/stage4/08-pisdr-limesdr/00-run.sh b/builder/stage4/08-pisdr-limesdr/00-run.sh index e202f08..5b3de8f 100755 --- a/builder/stage4/08-pisdr-limesdr/00-run.sh +++ b/builder/stage4/08-pisdr-limesdr/00-run.sh @@ -14,7 +14,9 @@ cd build cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic .. ninja install ldconfig +cd .. +rm -fr build -cd ../udev-rules +cd udev-rules ./install.sh EOF diff --git a/builder/stage4/08-pisdr-limesdr/01-run.sh b/builder/stage4/08-pisdr-limesdr/01-run.sh index cf2829a..d1abc53 100755 --- a/builder/stage4/08-pisdr-limesdr/01-run.sh +++ b/builder/stage4/08-pisdr-limesdr/01-run.sh @@ -15,4 +15,6 @@ cd build cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic .. ninja install ldconfig +cd .. +rm -fr build EOF diff --git a/builder/stage4/09-pisdr-airspy/00-run.sh b/builder/stage4/09-pisdr-airspy/00-run.sh index c76c6da..b7d6521 100755 --- a/builder/stage4/09-pisdr-airspy/00-run.sh +++ b/builder/stage4/09-pisdr-airspy/00-run.sh @@ -14,4 +14,6 @@ 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/09-pisdr-airspy/01-run.sh b/builder/stage4/09-pisdr-airspy/01-run.sh index c1e4796..cc1a032 100755 --- a/builder/stage4/09-pisdr-airspy/01-run.sh +++ b/builder/stage4/09-pisdr-airspy/01-run.sh @@ -14,4 +14,6 @@ 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/09-pisdr-airspy/02-run.sh b/builder/stage4/09-pisdr-airspy/02-run.sh index a74f9e5..3b71e61 100755 --- a/builder/stage4/09-pisdr-airspy/02-run.sh +++ b/builder/stage4/09-pisdr-airspy/02-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/09-pisdr-airspy/03-run.sh b/builder/stage4/09-pisdr-airspy/03-run.sh index 6585439..577ea43 100755 --- a/builder/stage4/09-pisdr-airspy/03-run.sh +++ b/builder/stage4/09-pisdr-airspy/03-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/10-pisdr-rtlsdr/00-run.sh b/builder/stage4/10-pisdr-rtlsdr/00-run.sh index eb1d4b1..730835e 100755 --- a/builder/stage4/10-pisdr-rtlsdr/00-run.sh +++ b/builder/stage4/10-pisdr-rtlsdr/00-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja -DINSTALL_UDEV_RULES=ON -DDETACH_KERNEL_DRIVER=ON .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/10-pisdr-rtlsdr/01-run.sh b/builder/stage4/10-pisdr-rtlsdr/01-run.sh index 410adba..720793e 100755 --- a/builder/stage4/10-pisdr-rtlsdr/01-run.sh +++ b/builder/stage4/10-pisdr-rtlsdr/01-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/11-pisdr-plutosdr/00-run.sh b/builder/stage4/11-pisdr-plutosdr/00-run.sh index e759b14..81509a2 100755 --- a/builder/stage4/11-pisdr-plutosdr/00-run.sh +++ b/builder/stage4/11-pisdr-plutosdr/00-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja -DINSTALL_UDEV_RULE=ON .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/11-pisdr-plutosdr/01-run.sh b/builder/stage4/11-pisdr-plutosdr/01-run.sh index 8c7b039..b24ae2d 100755 --- a/builder/stage4/11-pisdr-plutosdr/01-run.sh +++ b/builder/stage4/11-pisdr-plutosdr/01-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja -DINSTALL_UDEV_RULE=ON .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/11-pisdr-plutosdr/02-run.sh b/builder/stage4/11-pisdr-plutosdr/02-run.sh index 972833c..955ca2e 100755 --- a/builder/stage4/11-pisdr-plutosdr/02-run.sh +++ b/builder/stage4/11-pisdr-plutosdr/02-run.sh @@ -15,4 +15,6 @@ cd build cmake -GNinja -DINSTALL_UDEV_RULE=ON .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/11-pisdr-plutosdr/03-run.sh b/builder/stage4/11-pisdr-plutosdr/03-run.sh index 2dcf524..9d227bb 100755 --- a/builder/stage4/11-pisdr-plutosdr/03-run.sh +++ b/builder/stage4/11-pisdr-plutosdr/03-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/12-pisdr-hackrf/00-run.sh b/builder/stage4/12-pisdr-hackrf/00-run.sh index 3248f30..ab8dda8 100755 --- a/builder/stage4/12-pisdr-hackrf/00-run.sh +++ b/builder/stage4/12-pisdr-hackrf/00-run.sh @@ -14,4 +14,6 @@ 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/12-pisdr-hackrf/01-run.sh b/builder/stage4/12-pisdr-hackrf/01-run.sh index 51cd199..83f7367 100755 --- a/builder/stage4/12-pisdr-hackrf/01-run.sh +++ b/builder/stage4/12-pisdr-hackrf/01-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic .. ninja install ldconfig +cd .. +rm -fr build 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 index 8489510..b7fc6e0 100755 --- a/builder/stage4/13-pisdr-osmocom/00-run.sh +++ b/builder/stage4/13-pisdr-osmocom/00-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja .. ninja install ldconfig +cd .. +rm -fr build EOF diff --git a/builder/stage4/14-pisdr-gqrx/00-run.sh b/builder/stage4/14-pisdr-gqrx/00-run.sh index fd29abe..e3be7d2 100755 --- a/builder/stage4/14-pisdr-gqrx/00-run.sh +++ b/builder/stage4/14-pisdr-gqrx/00-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja .. ninja install ldconfig +cd .. +rm -fr build EOF diff --git a/builder/stage4/16-pisdr-rtl443/00-run.sh b/builder/stage4/16-pisdr-rtl443/00-run.sh index 866ec6f..4e15b8e 100755 --- a/builder/stage4/16-pisdr-rtl443/00-run.sh +++ b/builder/stage4/16-pisdr-rtl443/00-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/17-pisdr-sdrangel/00-run.sh b/builder/stage4/17-pisdr-sdrangel/00-run.sh index e71d9a0..723f8df 100755 --- a/builder/stage4/17-pisdr-sdrangel/00-run.sh +++ b/builder/stage4/17-pisdr-sdrangel/00-run.sh @@ -15,4 +15,6 @@ cd build cmake -GNinja .. ninja ldconfig +cd .. +rm -fr build EOF diff --git a/builder/stage4/17-pisdr-sdrangel/01-run.sh b/builder/stage4/17-pisdr-sdrangel/01-run.sh index 9da7e93..aea130a 100755 --- a/builder/stage4/17-pisdr-sdrangel/01-run.sh +++ b/builder/stage4/17-pisdr-sdrangel/01-run.sh @@ -15,4 +15,6 @@ cd build cmake -GNinja .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/17-pisdr-sdrangel/02-run.sh b/builder/stage4/17-pisdr-sdrangel/02-run.sh index 796ef3d..1ccb8cd 100755 --- a/builder/stage4/17-pisdr-sdrangel/02-run.sh +++ b/builder/stage4/17-pisdr-sdrangel/02-run.sh @@ -15,4 +15,6 @@ cd build cmake -GNinja .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/17-pisdr-sdrangel/03-run.sh b/builder/stage4/17-pisdr-sdrangel/03-run.sh index 2d565be..4524536 100755 --- a/builder/stage4/17-pisdr-sdrangel/03-run.sh +++ b/builder/stage4/17-pisdr-sdrangel/03-run.sh @@ -15,4 +15,6 @@ cd build cmake -GNinja -DUSE_MBELIB=ON .. ninja install ldconfig +cd .. +rm -fr build EOF diff --git a/builder/stage4/17-pisdr-sdrangel/04-run.sh b/builder/stage4/17-pisdr-sdrangel/04-run.sh index 2313f00..80ad793 100755 --- a/builder/stage4/17-pisdr-sdrangel/04-run.sh +++ b/builder/stage4/17-pisdr-sdrangel/04-run.sh @@ -15,4 +15,6 @@ cd build cmake -GNinja .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/17-pisdr-sdrangel/05-run.sh b/builder/stage4/17-pisdr-sdrangel/05-run.sh index 845b6e5..d98207d 100755 --- a/builder/stage4/17-pisdr-sdrangel/05-run.sh +++ b/builder/stage4/17-pisdr-sdrangel/05-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/18-pisdr-libacars/00-run.sh b/builder/stage4/18-pisdr-libacars/00-run.sh index c290d35..f9c781d 100755 --- a/builder/stage4/18-pisdr-libacars/00-run.sh +++ b/builder/stage4/18-pisdr-libacars/00-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/19-pisdr-acarsdec/00-run.sh b/builder/stage4/19-pisdr-acarsdec/00-run.sh index 9e86399..86ab2b8 100755 --- a/builder/stage4/19-pisdr-acarsdec/00-run.sh +++ b/builder/stage4/19-pisdr-acarsdec/00-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/20-pisdr-multimonng/00-run.sh b/builder/stage4/20-pisdr-multimonng/00-run.sh index a76cc41..718544b 100755 --- a/builder/stage4/20-pisdr-multimonng/00-run.sh +++ b/builder/stage4/20-pisdr-multimonng/00-run.sh @@ -14,4 +14,6 @@ cd build cmake -GNinja .. ninja install ldconfig +cd .. +rm -fr build EOF \ No newline at end of file diff --git a/builder/stage4/26-pisdr-udev/00-run.sh b/builder/stage4/26-pisdr-udev/00-run.sh index 9d6f84f..ec6fc03 100755 --- a/builder/stage4/26-pisdr-udev/00-run.sh +++ b/builder/stage4/26-pisdr-udev/00-run.sh @@ -7,6 +7,7 @@ chown pi:pi /etc/udev/rules.d/rtl-sdr.rules chown pi:pi /lib/udev/rules.d/90-libiio.rules chown pi:pi /etc/udev/rules.d/53-hackrf.rules chown pi:pi /etc/udev/rules.d/uhd-usrp.rules +chown pi:pi /etc/udev/rules.d/64-limesuite.rules udevadm control --reload-rules udevadm trigger EOF \ No newline at end of file