PiSDR Image Version 4.1 (#31)

* Fix GNURadio Build

* Bump SDRAngel dependencies versions.

* GR 3.8, UHD (experimental), Ninja builder

* Manually merging pi-gen updates

* Fix directories order.

* Fix build bash.

* Update Dockerfile

builder/.gitignore

@@ -1,5 +1,6 @@
 deploy/*
 work/*
+config
 postrun.sh
 SKIP
 SKIP_IMAGES

builder/Dockerfile

@@ -1,12 +1,13 @@
-FROM i386/debian:buster
+FROM i386/debian:buster # For the love of god, don't update this.
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get -y update && \
-    apt-get -y install \
+    apt-get -y install --no-install-recommends \
         git vim parted \
         quilt coreutils qemu-user-static debootstrap zerofree zip dosfstools \
-        bsdtar libcap2-bin rsync grep udev xz-utils curl xxd file kmod\
+        bsdtar libcap2-bin rsync grep udev xz-utils curl xxd file kmod bc\
+        binfmt-support ca-certificates \
     && rm -rf /var/lib/apt/lists/*
 
 COPY . /pi-gen/

builder/README.md

@@ -14,7 +14,7 @@ To install the required dependencies for pi-gen you should run:
 
 ```bash
 apt-get install coreutils quilt parted qemu-user-static debootstrap zerofree zip \
-dosfstools bsdtar libcap2-bin grep rsync xz-utils file git curl
+dosfstools bsdtar libcap2-bin grep rsync xz-utils file git curl bc
 ```
 
 The file `depends` contains a list of tools needed.  The format of this
@@ -36,6 +36,11 @@ The following environment variables are supported:
    but you should use something else for a customized version.  Export files
    in stages may add suffixes to `IMG_NAME`.
 
+ * `RELEASE` (Default: buster)
+
+   The release version to build images against. Valid values are jessie, stretch
+   buster, bullseye, and testing.
+
  * `APT_PROXY` (Default: unset)
 
    If you require the use of an apt proxy, set it here.  This proxy setting
@@ -82,7 +87,7 @@ The following environment variables are supported:
 
    Default system locale.
 
- * `HOSTNAME` (Default: "raspberrypi" )
+ * `TARGET_HOSTNAME` (Default: "raspberrypi" )
 
    Setting the hostname to the specified value.
 
@@ -119,11 +124,11 @@ The following environment variables are supported:
 
  * `WPA_ESSID`, `WPA_PASSWORD` and `WPA_COUNTRY` (Default: unset)
 
-   If these are set, they are use to configure `wpa_supplicant.conf`, so that the raspberry pi can automatically connect to a wifi network on first boot. If `WPA_ESSID` is set and `WPA_PASSWORD` is unset an unprotected wifi network will be configured.
+   If these are set, they are use to configure `wpa_supplicant.conf`, so that the Raspberry Pi can automatically connect to a wifi network on first boot. If `WPA_ESSID` is set and `WPA_PASSWORD` is unset an unprotected wifi network will be configured. If set, `WPA_PASSWORD` must be between 8 and 63 characters.
 
  * `ENABLE_SSH` (Default: `0`)
 
-   Setting to `1` will enable ssh server for remote log in. Note that if you are using a common password such as the defaults there is a high risk of attackers taking over you RaspberryPi.
+   Setting to `1` will enable ssh server for remote log in. Note that if you are using a common password such as the defaults there is a high risk of attackers taking over you Raspberry Pi.
 
  * `STAGE_LIST` (Default: `stage*`)
 

builder/build-docker.sh

@@ -32,7 +32,7 @@ done
 
 # Ensure that the configuration file is an absolute path
 if test -x /usr/bin/realpath; then
-	CONFIG_FILE=$(realpath -s "$CONFIG_FILE")
+	CONFIG_FILE=$(realpath -s "$CONFIG_FILE" || realpath "$CONFIG_FILE")
 fi
 
 # Ensure that the confguration file is present
@@ -41,7 +41,7 @@ if test -z "${CONFIG_FILE}"; then
 	exit 1
 else
 	# shellcheck disable=SC1090
-	source "${CONFIG_FILE}"
+	source ${CONFIG_FILE}
 fi
 
 CONTAINER_NAME=${CONTAINER_NAME:-pigen_work}
@@ -73,7 +73,7 @@ fi
 # Modify original build-options to allow config file to be mounted in the docker container
 BUILD_OPTS="$(echo "${BUILD_OPTS:-}" | sed -E 's@\-c\s?([^ ]+)@-c /config@')"
 
-${DOCKER} build --no-cache --network=host -t pi-gen "${DIR}"
+${DOCKER} build -t pi-gen "${DIR}"
 if [ "${CONTAINER_EXISTS}" != "" ]; then
 	trap 'echo "got CTRL+C... please wait 5s" && ${DOCKER} stop -t 5 ${CONTAINER_NAME}_cont' SIGINT SIGTERM
 	time ${DOCKER} run --rm --privileged \

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"
@@ -170,10 +174,11 @@ export DEPLOY_DIR=${DEPLOY_DIR:-"${BASE_DIR}/deploy"}
 export DEPLOY_ZIP="${DEPLOY_ZIP:-1}"
 export LOG_FILE="${WORK_DIR}/build.log"
 
-export HOSTNAME=${HOSTNAME:-raspberrypi}
+export TARGET_HOSTNAME=${TARGET_HOSTNAME:-raspberrypi}
 
 export FIRST_USER_NAME=${FIRST_USER_NAME:-pi}
 export FIRST_USER_PASS=${FIRST_USER_PASS:-raspberry}
+export RELEASE=${RELEASE:-buster}
 export WPA_ESSID
 export WPA_PASSWORD
 export WPA_COUNTRY
@@ -228,6 +233,11 @@ if [[ -n "${APT_PROXY}" ]] && ! curl --silent "${APT_PROXY}" >/dev/null ; then
 	exit 1
 fi
 
+if [[ -n "${WPA_PASSWORD}" && ${#WPA_PASSWORD} -lt 8 || ${#WPA_PASSWORD} -gt 63  ]] ; then
+	echo "WPA_PASSWORD" must be between 8 and 63 characters
+	exit 1
+fi
+
 mkdir -p "${WORK_DIR}"
 log "Begin ${BASE_DIR}"
 

builder/depends

@@ -16,3 +16,4 @@ xxd
 file
 git
 lsmod:kmod
+bc

builder/docker-compose.yml

@@ -0,0 +1,10 @@
+version: '2'
+
+services:
+  apt-cacher-ng:
+    restart: unless-stopped
+    image: sameersbn/apt-cacher-ng:latest
+    ports:
+    - "3142:3142"
+    volumes:
+    - ./apt-cacher-ng:/var/cache/apt-cacher-ng

builder/export-image/prerun.sh

@@ -18,7 +18,7 @@ ALIGN="$((4 * 1024 * 1024))"
 # some overhead (since actual space usage is usually rounded up to the
 # filesystem block size) and gives some free space on the resulting
 # image.
-ROOT_MARGIN=$((800*1024*1024))
+ROOT_MARGIN="$(echo "($ROOT_SIZE * 0.2 + 200 * 1024 * 1024) / 1" | bc)"
 
 BOOT_PART_START=$((ALIGN))
 BOOT_PART_SIZE=$(((BOOT_SIZE + ALIGN - 1) / ALIGN * ALIGN))

builder/stage0/00-configure-apt/00-run.sh

@@ -2,6 +2,8 @@
 
 install -m 644 files/sources.list "${ROOTFS_DIR}/etc/apt/"
 install -m 644 files/raspi.list "${ROOTFS_DIR}/etc/apt/sources.list.d/"
+sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list"
+sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/raspi.list"
 
 if [ -n "$APT_PROXY" ]; then
 	install -m 644 files/51cache "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"

builder/stage0/00-configure-apt/files/raspi.list

@@ -1,3 +1,3 @@
-deb http://archive.raspberrypi.org/debian/ buster main
+deb http://archive.raspberrypi.org/debian/ RELEASE main
 # Uncomment line below then 'apt-get update' to enable 'apt-get source'
-#deb-src http://archive.raspberrypi.org/debian/ buster main
+#deb-src http://archive.raspberrypi.org/debian/ RELEASE main

builder/stage0/00-configure-apt/files/sources.list

@@ -1,3 +1,3 @@
-deb http://mirrors.ocf.berkeley.edu/raspbian/raspbian buster main contrib non-free rpi
+deb http://raspbian.raspberrypi.org/raspbian/ RELEASE main contrib non-free rpi
 # Uncomment line below then 'apt-get update' to enable 'apt-get source'
-#deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
+#deb-src http://raspbian.raspberrypi.org/raspbian/ RELEASE main contrib non-free rpi

builder/stage0/prerun.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -e
 
 if [ ! -d "${ROOTFS_DIR}" ]; then
-	bootstrap buster "${ROOTFS_DIR}" http://raspbian.raspberrypi.org/raspbian/
-fi
+	bootstrap ${RELEASE} "${ROOTFS_DIR}" http://raspbian.raspberrypi.org/raspbian/
+fi

builder/stage1/02-net-tweaks/00-run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-echo "${HOSTNAME}" > "${ROOTFS_DIR}/etc/hostname"
-echo "127.0.1.1		${HOSTNAME}" >> "${ROOTFS_DIR}/etc/hosts"
+echo "${TARGET_HOSTNAME}" > "${ROOTFS_DIR}/etc/hostname"
+echo "127.0.1.1		${TARGET_HOSTNAME}" >> "${ROOTFS_DIR}/etc/hosts"
 
 ln -sf /dev/null "${ROOTFS_DIR}/etc/systemd/network/99-default.link"

builder/stage2/01-sys-tweaks/00-packages

@@ -28,3 +28,4 @@ vl805fw
 ntfs-3g
 pciutils
 rpi-eeprom
+raspinfo

builder/stage2/02-net-tweaks/01-run.sh

@@ -12,7 +12,8 @@ fi
 
 if [ -v WPA_ESSID ] && [ -v WPA_PASSWORD ]; then
 on_chroot <<EOF
-wpa_passphrase "${WPA_ESSID}" "${WPA_PASSWORD}" >> "/etc/wpa_supplicant/wpa_supplicant.conf"
+set -o pipefail
+wpa_passphrase "${WPA_ESSID}" "${WPA_PASSWORD}" | tee -a "/etc/wpa_supplicant/wpa_supplicant.conf"
 EOF
 elif [ -v WPA_ESSID ]; then
 cat >> "${ROOTFS_DIR}/etc/wpa_supplicant/wpa_supplicant.conf" << EOL
@@ -26,5 +27,5 @@ fi
 
 # Disable wifi on 5GHz models
 mkdir -p "${ROOTFS_DIR}/var/lib/systemd/rfkill/"
-echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-3f300000.mmc:wlan"
-echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-fe300000.mmc:wlan"
+echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-3f300000.mmcnr:wlan"
+echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-fe300000.mmcnr:wlan"

builder/stage4/04-pisdr-system/00-packages

@@ -1,2 +1,7 @@
 vim
-tmux
+tmux
+cmake
+build-essential
+git
+pkg-config
+re2c

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

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

builder/stage4/05-pisdr-gnuradio/00-packages-nr

@@ -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

builder/stage4/05-pisdr-gnuradio/00-run.sh

@@ -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
-

builder/stage4/05-pisdr-uhd/00-packages-nr

@@ -0,0 +1,3 @@
+libboost-all-dev
+libusb-1.0-0-dev
+python3-mako

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
+

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

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 install
+ldconfig
+EOF
+

builder/stage4/06-pisdr-soapysdr/00-packages-nr → builder/stage4/07-pisdr-soapysdr/00-packages-nr

@@ -1,7 +1,4 @@
-git
-g++
 swig
-cmake
 avahi-daemon
 libavahi-client-dev
 libusb-1.0-0-dev

builder/stage4/06-pisdr-soapysdr/01-run.sh → builder/stage4/07-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

builder/stage4/06-pisdr-soapysdr/02-run.sh → builder/stage4/07-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

builder/stage4/06-pisdr-soapysdr/03-run.sh → builder/stage4/07-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
+EOF

builder/stage4/07-pisdr-limesdr/00-packages-nr → builder/stage4/08-pisdr-limesdr/00-packages-nr

@@ -1,7 +1,4 @@
-git
-g++
 swig
-cmake
 libsqlite3-dev
 libi2c-dev
 libusb-1.0-0-dev

builder/stage4/07-pisdr-limesdr/00-run.sh → builder/stage4/08-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 install
 ldconfig
 
 cd ../udev-rules

builder/stage4/07-pisdr-limesdr/01-run.sh → builder/stage4/08-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 install
 ldconfig
 EOF

builder/stage4/08-pisdr-airspy/00-run.sh → builder/stage4/09-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 install
 ldconfig
 EOF

builder/stage4/08-pisdr-airspy/01-run.sh → builder/stage4/09-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

builder/stage4/08-pisdr-airspy/02-run.sh → builder/stage4/09-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

builder/stage4/08-pisdr-airspy/03-run.sh → builder/stage4/09-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

builder/stage4/09-pisdr-rtlsdr/00-run.sh → builder/stage4/10-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

builder/stage4/09-pisdr-rtlsdr/01-run.sh → builder/stage4/10-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

builder/stage4/10-pisdr-plutosdr/00-packages-nr → builder/stage4/11-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

builder/stage4/10-pisdr-plutosdr/00-run.sh → builder/stage4/11-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

builder/stage4/10-pisdr-plutosdr/01-run.sh → builder/stage4/11-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

builder/stage4/10-pisdr-plutosdr/02-run.sh → builder/stage4/11-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

builder/stage4/10-pisdr-plutosdr/03-run.sh → builder/stage4/11-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

builder/stage4/11-pisdr-hackrf/00-run.sh → builder/stage4/12-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

builder/stage4/11-pisdr-hackrf/01-run.sh → builder/stage4/12-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

builder/stage4/12-pisdr-osmocom/00-run.sh → builder/stage4/13-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
+EOF

builder/stage4/13-pisdr-gqrx/00-packages-nr → builder/stage4/14-pisdr-gqrx/00-packages-nr

@@ -1,7 +1,3 @@
-git
-cmake
-g++
-pkg-config
 autoconf
 automake
 libtool

builder/stage4/13-pisdr-gqrx/00-run.sh → builder/stage4/14-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
+EOF

builder/stage4/15-pisdr-rtl443/00-run.sh → builder/stage4/16-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

builder/stage4/16-pisdr-sdrangel/00-packages-nr → builder/stage4/17-pisdr-sdrangel/00-packages-nr

@@ -1,7 +1,3 @@
-git
-cmake
-g++
-pkg-config
 autoconf
 automake
 libtool

builder/stage4/16-pisdr-sdrangel/00-run.sh → builder/stage4/17-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

builder/stage4/16-pisdr-sdrangel/01-run.sh → builder/stage4/17-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

builder/stage4/16-pisdr-sdrangel/02-run.sh → builder/stage4/17-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

builder/stage4/16-pisdr-sdrangel/03-run.sh → builder/stage4/17-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

builder/stage4/16-pisdr-sdrangel/04-run.sh → builder/stage4/17-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

builder/stage4/16-pisdr-sdrangel/05-run.sh → builder/stage4/17-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

builder/stage4/17-pisdr-libacars/00-run.sh → builder/stage4/18-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

builder/stage4/18-pisdr-acarsdec/00-run.sh → builder/stage4/19-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

builder/stage4/19-pisdr-multimonng/00-run.sh → builder/stage4/20-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