fix(x86): handle missing uci dhcp.server option

Makefile

@@ -2,13 +2,15 @@ OPENWRT_DEVICE ?= 192.168.1.1
 BACKUP_DATE ?=
 
 GIT_VERSION := $(shell git describe --always)
+DATE_VERSION := $(shell date +%Y.%m.%d)
+FULL_VERSION := v$(DATE_VERSION)-$(GIT_VERSION)
 
 OPENWRT_VERSION ?= 22.03.2
 OPENWRT_TARGET ?= mvebu/cortexa9
 OPENWRT_TARGET_DASHED ?= $(shell echo $(OPENWRT_TARGET) | sed 's|/|-|')
 OPENWRT_PROFILE ?= linksys_wrt1200ac
 OPENWRT_PACKAGES ?= $(shell cat packages.txt)
-EXTRA_IMAGE_NAME ?= emissary-$(GIT_VERSION)
+EXTRA_IMAGE_NAME ?= emissary-$(FULL_VERSION)
 BIN_DIR_NAME_SUFFIX ?= 
 
 IMAGEBUILDER_URL ?= https://downloads.openwrt.org/releases/$(OPENWRT_VERSION)/targets/$(OPENWRT_TARGET)/openwrt-imagebuilder-$(OPENWRT_VERSION)-$(OPENWRT_TARGET_DASHED).Linux-x86_64.tar.xz
@@ -103,8 +105,8 @@ gitea-release: tools/gitea-release/bin/gitea-release.sh
 	GITEA_RELEASE_PROJECT="emissary-firmware" \
 		GITEA_RELEASE_ORG="arcad" \
 		GITEA_RELEASE_BASE_URL="https://forge.cadoles.com" \
-		GITEA_RELEASE_VERSION="$(GIT_VERSION)" \
-		GITEA_RELEASE_NAME="$(GIT_VERSION)" \
+		GITEA_RELEASE_VERSION="$(FULL_VERSION)" \
+		GITEA_RELEASE_NAME="$(FULL_VERSION)" \
 		GITEA_RELEASE_COMMITISH_TARGET="$(GIT_VERSION)" \
 		GITEA_RELEASE_IS_DRAFT="false" \
 		GITEA_RELEASE_BODY="" \

files/etc/uci-defaults/99-machine-id.sh

@@ -13,12 +13,13 @@ main() {
     # Accumulate data to create unique machine id
     local mac_addresses=$(cat /sys/class/net/*/address | uniq | sort)
     local device_model=$(cat /sys/firmware/devicetree/base/model)
+    local urandom_seed=$(cat /etc/urandom.seed | sha256sum | cut -d ' ' -f1)
 
     # Ensure destination directory
     mkdir -p "$(dirname "$machine_id_file")"
 
     # Generate SHA256 hash of data and save it to $machine_id_file
-    echo "$mac_adresses $device_model" | sha256sum | cut -d ' ' -f1 > "$machine_id_file"
+    echo "$mac_adresses $device_model $urandom_seed" | sha256sum | cut -d ' ' -f1 > "$machine_id_file"
 }
 
 main

misc/x86/uci-defaults/99-x86-firewall-rules.sh

@@ -28,7 +28,7 @@ main() {
     service firewall restart
 
     # Forward DNS queries to public DNS
-    uci -q delete dhcp.@dnsmasq[0].server
+    ( uci -q delete dhcp.@dnsmasq[0].server || exit 0 )
     uci add_list dhcp.@dnsmasq[0].server="8.8.8.8"
     uci add_list dhcp.@dnsmasq[0].server="8.8.4.4"
     

targets/generic.mk

@@ -1,6 +1,6 @@
-all: x86_generic
+all: x86-generic
 
-x86_generic:
+x86-generic:
 	$(MAKE) \
 		ADDITIONAL_INSTALL="install-x86-network-config install-x86-firewall-rules" \
 		OPENWRT_TARGET="x86/generic" \
@@ -8,7 +8,7 @@ x86_generic:
 		OPENWRT_PROFILE="generic" \
 		build
 
-run_x86_generic: bin/$(OPENWRT_VERSION)/x86/generic/generic/openwrt-$(OPENWRT_VERSION)-emissary-*-ext4-combined.img
+run-x86-generic: bin/$(OPENWRT_VERSION)/x86/generic/generic/openwrt-$(OPENWRT_VERSION)-emissary-*-ext4-combined.img
 	qemu-system-x86_64 \
 		-enable-kvm \
 		-nographic \

targets/raspberry-pi.mk

@@ -0,0 +1,17 @@
+all: rpi-4 rpi-3
+
+rpi-4:
+	$(MAKE) \
+		ADDITIONAL_INSTALL="" \
+		OPENWRT_TARGET="bcm27xx/bcm2711" \
+		EMISSARY_ARCH="arm64" \
+		OPENWRT_PROFILE="rpi-4" \
+		build
+
+rpi-3:
+	$(MAKE) \
+		ADDITIONAL_INSTALL="" \
+		OPENWRT_TARGET="bcm27xx/bcm2710" \
+		EMISSARY_ARCH="arm64" \
+		OPENWRT_PROFILE="rpi-3" \
+		build