aarch64 build tests

Makefile

@@ -17,6 +17,13 @@ $(if $(GOROOT),,$(error GOROOT is not set!))
 	PLATFORMDEPENDENT=fancontrol
 endif
 
+ARCH := $(shell uname -p)
+ifeq ($(ARCH),aarch64)
+	OGN_RX_BINARY=ogn/ogn-rx-eu_aarch64
+else
+	OGN_RX_BINARY=ogn/ogn-rx-eu_arm
+endif
+
 STRATUX_SRC=main/gen_gdl90.go main/traffic.go main/gps.go main/network.go main/managementinterface.go main/sdr.go main/ping.go main/uibroadcast.go main/monotonic.go main/datalog.go main/equations.go main/sensors.go main/cputemp.go main/lowpower_uat.go main/ogn.go main/flarm-nmea.go main/networksettings.go main/xplane.go
 FANCONTROL_SRC=main/fancontrol.go main/equations.go main/cputemp.go
 
@@ -73,7 +80,7 @@ install: ogn/ddb.json
 	cp -f image/hostapd.conf.template /etc/hostapd/
 	cp -f image/interfaces.template /etc/network/
 	cp -f image/wpa_supplicant.conf.template /etc/wpa_supplicant/
-	cp -f ogn/ogn-rx-eu_arm /usr/bin/ogn-rx-eu
+	cp -f $(OGN_RX_BINARY) /usr/bin/ogn-rx-eu
 	cp -f ogn/ddb.json /etc/
 
 clean:

dump978/Makefile

@@ -1,7 +1,7 @@
 CFLAGS+=-O2 -Wall -Werror -Ifec
 LDFLAGS=
 LIBS=-lm
-CC=gcc
+CC?=gcc
 
 all: dump978 uat2json uat2text uat2esnt extract_nexrad
 

image/mk_europe_edition64.sh

@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# To run this, make sure that this is installed:
+# sudo apt install --yes qemu-user-static qemu-system-arm
+# Run this script as root.
+# Run with argument "dev" to not clone the stratux repository from remote, but instead copy this current local checkout onto the image
+set -x
+BASE_IMAGE_URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2020-08-24/2020-08-20-raspios-buster-arm64-lite.zip"
+ZIPNAME="2020-08-20-raspios-buster-arm64-lite.zip"
+IMGNAME="${ZIPNAME%.*}.img"
+TMPDIR="$HOME/stratux-tmp"
+
+die() {
+    echo $1
+    exit 1
+}
+
+if [ "$#" -ne 2 ]; then
+    die "Usage: " $0 " dev|prod branch"
+fi
+
+# cd to script directory
+cd "$(dirname "$0")"
+SRCDIR="$(realpath $(pwd)/..)"
+mkdir -p $TMPDIR
+cd $TMPDIR
+
+# Download/extract image
+wget -c $BASE_IMAGE_URL || die "Download failed"
+unzip $ZIPNAME || die "Extracting image failed"
+
+# Check where in the image the root partition begins:
+sector=$(fdisk -l $IMGNAME | grep Linux | awk -F ' ' '{print $2}')
+partoffset=$(( 512*sector ))
+bootoffset=$(fdisk -l $IMGNAME | grep W95 | awk -F ' ' '{print $2}')
+bootoffset=$(( 512*bootoffset ))
+sizelimit=$(fdisk -l $IMGNAME | grep W95 | awk -F ' ' '{print $4}')
+sizelimit=$(( 512*sizelimit ))
+
+# Original image partition is too small to hold our stuff.. resize it to 2.5gb
+# Append one GB and truncate to size
+#truncate -s 2600M $IMGNAME
+qemu-img resize $IMGNAME 3000M || die "Image resize failed"
+lo=$(losetup -f)
+losetup $lo $IMGNAME
+partprobe $lo
+e2fsck -f ${lo}p2
+fdisk $lo <<EOF
+p
+d
+2
+n
+p
+2
+$sector
+
+p
+w
+EOF
+partprobe $lo || die "Partprobe failed failed"
+resize2fs -p ${lo}p2 || die "FS resize failed"
+losetup -d $lo || die "Loop device setup failed"
+
+
+sleep 3 # for whatever reason loop device is not immediately detached and takes a short time
+
+# Mount image locally, clone our repo, install packages..
+mkdir -p mnt
+mount -t ext4 -o offset=$partoffset $IMGNAME mnt/ || die "root-mount failed"
+mount -t vfat -o offset=$bootoffset,sizelimit=$sizelimit $IMGNAME mnt/boot || die "boot-mount failed"
+cp $(which qemu-aarch64-static) mnt/usr/bin || die "Failed to copy qemu-arm-static into image"
+
+cd mnt/root/
+if [ "$1" == "dev" ]; then
+    rsync -av --progress --exclude=ogn/esp-idf $SRCDIR ./
+    cd stratux && git checkout $2 && cd ..
+else
+    git clone --recursive -b $2 https://github.com/b3nn0/stratux.git
+fi
+cd ../../
+
+chroot mnt qemu-aarch64-static -cpu cortex-a72 /bin/bash -c /root/stratux/image/mk_europe_edition_device_setup64.sh
+mkdir out
+
+# Copy the selfupdate file out of there..
+cp mnt/root/stratux/work/*.sh out
+rm -r mnt/root/stratux/work
+
+umount mnt/boot
+umount mnt
+
+mv $IMGNAME out/
+
+cd $SRCDIR
+outname="stratux-$(git describe --tags --abbrev=0)-$(git log -n 1 --pretty=%H | cut -c 1-8).img"
+cd $TMPDIR/out
+mv $IMGNAME $outname
+zip $outname.zip $outname
+
+
+echo "Final image has been placed into $TMPDIR/out. Please install and test the image."

image/mk_europe_edition_device_setup64.sh

@@ -0,0 +1,230 @@
+#!/bin/bash
+
+# DO NOT CALL ME DIRECTLY!
+# This script is called by mk_europe_edition.sh via qemu
+
+mv /etc/ld.so.preload /etc/ld.so.preload.bak
+cd /root/stratux
+
+# Make sure that the upgrade doesn't restart services in the chroot..
+mkdir /root/fake
+ln -s /bin/true /root/fake/initctl
+ln -s /bin/true /root/fake/invoke-rc.d
+ln -s /bin/true /root/fake/restart
+ln -s /bin/true /root/fake/start
+ln -s /bin/true /root/fake/stop
+ln -s /bin/true /root/fake/start-stop-daemon
+ln -s /bin/true /root/fake/service
+ln -s /bin/true /root/fake/deb-systemd-helper
+
+# Fake a proc FS for raspberrypi-sys-mods_20170519_armhf... Extend me as needed
+mkdir -p /proc/sys/vm/
+
+apt update
+#PATH=/root/fake:$PATH apt dist-upgrade --yes
+apt clean
+
+PATH=/root/fake:$PATH apt install --yes libjpeg62-turbo-dev libconfig9 rpi-update hostapd isc-dhcp-server tcpdump git cmake \
+    libusb-1.0-0-dev build-essential build-essential autoconf libtool i2c-tools screen libfftw3-dev libncurses-dev
+apt clean
+#echo y | rpi-update
+
+# TODO: for some reason, gcc crashes a lot when compiling with qemu-user 64 bit.. therefore we will have to use clang for now
+# Note that we also had to increase image size to 3gb for this.. hope we can reduce it again in the future
+apt --yes install clang
+export CC=clang
+
+
+systemctl enable isc-dhcp-server
+systemctl enable ssh
+systemctl disable ntp
+systemctl disable dhcpcd
+systemctl disable hciuart
+systemctl disable hostapd
+
+echo INTERFACESv4=\"wlan0\" >> /etc/default/isc-dhcp-server
+
+rm -r /proc/*
+rm -r /root/fake
+
+
+# For some reason in buster, the 8192cu module seems to crash the kernel when a client connects to hostapd.
+# Use rtl8192cu module instead, even though raspbian doesn't seem to recommend it.
+rm /etc/modprobe.d/blacklist-rtl8192cu.conf
+echo "blacklist 8192cu" >> /etc/modprobe.d/blacklist-8192cu.conf
+
+# Install golang
+cd /root
+wget https://golang.org/dl/go1.16.1.linux-arm64.tar.gz
+tar xzf go1.16.1.linux-arm64.tar.gz
+rm go1.16.1.linux-arm64.tar.gz
+
+
+# Prepare wiringpi for fancontrol and some more tools. Need latest version for pi4 support
+cd /root && git clone https://github.com/WiringPi/WiringPi.git && cd WiringPi/wiringPi && make && make install
+cd /root && rm -r WiringPi
+#wget https://project-downloads.drogon.net/wiringpi-latest.deb
+#dpkg -i wiringpi-latest.deb
+#rm wiringpi-latest.deb
+
+
+cd /root/stratux
+cp image/bashrc.txt /root/.bashrc
+source /root/.bashrc
+
+# Prepare librtlsdr. The one shipping with buster uses usb_zerocopy, which is extremely slow on newer kernels, so
+# we manually compile the osmocom version that disables zerocopy by default..
+cd /root/
+rm -rf rtl-sdr
+git clone https://github.com/osmocom/rtl-sdr.git
+cd rtl-sdr
+git checkout 0847e93e0869feab50fd27c7afeb85d78ca04631 # Nov. 20, 2020
+mkdir build && cd build
+cmake .. -DENABLE_ZEROCOPY=0
+make -j8
+make install
+cd /root/
+rm -r rtl-sdr
+
+ldconfig
+
+# Debian seems to ship with an invalid pkgconfig for librtlsdr.. fix it:
+#sed -i -e 's/prefix=/prefix=\/usr/g' /usr/lib/arm-linux-gnueabihf/pkgconfig/librtlsdr.pc
+#sed -i -e 's/libdir=/libdir=${prefix}\/lib\/arm-linux-gnueabihf/g' /usr/lib/arm-linux-gnueabihf/pkgconfig/librtlsdr.pc
+
+
+# Compile stratux
+cd /root/stratux
+
+make clean
+# Sometimes go build segfaults in qemu for some reason.. we will just try three times and hope for the best
+make
+make install
+
+
+##### Some device setup - copy files from image directory ####
+cd /root/stratux/image
+#motd
+cp -f motd /etc/motd
+
+#dhcpd config
+cp -f dhcpd.conf /etc/dhcp/dhcpd.conf
+cp -f dhcpd.conf.template /etc/dhcp/dhcpd.conf.template
+
+#hostapd config
+cp -f hostapd.conf /etc/hostapd/hostapd.conf
+cp -f hostapd.conf.template /etc/hostapd/hostapd.conf.template
+
+#WPA supplicant config for wifi direct
+cp -f wpa_supplicant.conf.template /etc/wpa_supplicant/wpa_supplicant.conf.template
+
+#hostapd manager script
+cp -f hostapd_manager.sh /usr/sbin/hostapd_manager.sh
+chmod 755 /usr/sbin/hostapd_manager.sh
+
+#remove hostapd startup scripts
+rm -f /etc/rc*.d/*hostapd /etc/network/if-pre-up.d/hostapd /etc/network/if-post-down.d/hostapd /etc/init.d/hostapd /etc/default/hostapd
+#interface config
+cp -f interfaces /etc/network/interfaces
+cp -f interfaces.template /etc/network/interfaces.template
+
+#custom hostapd start script
+cp stratux-wifi.sh /usr/sbin/
+chmod 755 /usr/sbin/stratux-wifi.sh
+
+#SDR Serial Script
+cp -f sdr-tool.sh /usr/sbin/sdr-tool.sh
+chmod 755 /usr/sbin/sdr-tool.sh
+
+#ping udev
+cp -f 99-uavionix.rules /etc/udev/rules.d
+
+#logrotate conf
+cp -f logrotate.conf /etc/logrotate.conf
+
+#fan/temp control script
+#remove old script
+rm -rf /usr/bin/fancontrol.py /usr/bin/fancontrol
+#install new program
+cp ../fancontrol /usr/bin
+chmod 755 /usr/bin/fancontrol
+/usr/bin/fancontrol remove
+/usr/bin/fancontrol install
+
+#isc-dhcp-server config
+cp -f isc-dhcp-server /etc/default/isc-dhcp-server
+
+#sshd config
+# Do not copy for now. It contains many deprecated options and isn't needed.
+cp -f sshd_config /etc/ssh/sshd_config
+
+#udev config
+cp -f 10-stratux.rules /etc/udev/rules.d
+
+#stratux files
+cp -f ../libdump978.so /usr/lib/libdump978.so
+
+#debug aliases
+cp -f stxAliases.txt /root/.stxAliases
+
+#rtl-sdr setup
+cp -f rtl-sdr-blacklist.conf /etc/modprobe.d/
+
+#system tweaks
+cp -f modules.txt /etc/modules
+
+#boot settings
+cp -f config.txt /boot/
+echo -e "\narm_64bit=1" >> /boot/config.txt
+
+#cp /root/stratux/test/screen/screen.py /usr/bin/stratux-screen.py
+#mkdir -p /etc/stratux-screen/
+#cp -f /root/stratux/test/screen/stratux-logo-64x64.bmp /etc/stratux-screen/stratux-logo-64x64.bmp
+#cp -f /root/stratux/test/screen/CnC_Red_Alert.ttf /etc/stratux-screen/CnC_Red_Alert.ttf
+
+#startup scripts
+cp -f ../__lib__systemd__system__stratux.service /lib/systemd/system/stratux.service
+cp -f ../__root__stratux-pre-start.sh /root/stratux-pre-start.sh
+cp -f rc.local /etc/rc.local
+
+#kalibrate-rtl
+cd /root
+rm -rf kalibrate-rtl
+git clone https://github.com/steve-m/kalibrate-rtl
+cd kalibrate-rtl
+./bootstrap
+./configure
+make -j8
+make install
+cd /root && rm -rf kalibrate-rtl
+
+
+# TODO: not working right now - the pip one seems to at least make stratux-screen runnable (untested)
+#cd /root
+#git clone https://github.com/rm-hull/ssd1306
+#cd ssd1306
+# Force an older version of ssd1306, since recent changes have caused a lot of compatibility issues.
+#git reset --hard 232fc801b0b8bd551290e26a13122c42d628fd39
+#echo Y | python setup.py install
+#pip install luma.core
+#pip install luma.oled
+
+
+#disable serial console
+sed -i /boot/cmdline.txt -e "s/console=serial0,[0-9]\+ //"
+
+#Set the keyboard layout to US.
+sed -i /etc/default/keyboard -e "/^XKBLAYOUT/s/\".*\"/\"us\"/"
+
+
+# TODO: done -- uninstall clang again
+apt remove --yes clang
+apt autoremove --yes
+
+
+# Now also prepare the update file..
+cd /root/stratux/selfupdate
+./makeupdate.sh
+
+
+mv /etc/ld.so.preload.bak /etc/ld.so.preload