Updates to build against newest releases; kernel is crashing

2026-06-11 00:09:29 +00:00 · 2026-04-04 20:58:20 -05:00
parent 9706cd4215
commit 57cb3d5e09
5 changed files with 278 additions and 299 deletions
@@ -1,6 +1,6 @@
 PKG_VERSION = v1.12.0
-TALOS_VERSION = v1.12.1
-SBCOVERLAY_VERSION = main
+TALOS_VERSION = v1.12.6
+SBCOVERLAY_VERSION = v0.2.0

 PUSH ?= true
 REGISTRY ?= ghcr.io
@@ -12,24 +12,22 @@ REGISTRY_USERNAME ?= talos-$(RPI_MODEL)
 TAG ?= $(shell git describe --tags --exact-match)

 SED ?= sed
-ASSET_TYPE ?= installer
-CONFIG_TXT = dtparam=i2c_arm=on
+ASSET_TYPE ?= rpi_5
+CONFIG_TXT ?= dtparam=i2c_arm=on

 EXTENSIONS ?=
 EXTENSION_ARGS = $(foreach ext,$(EXTENSIONS),--system-extension-image $(ext))

-SBCOVERLAY_PI4_IMAGE ?= ghcr.io/siderolabs/sbc-raspberrypi:v0.1.5
-
 PKG_REPOSITORY = https://github.com/siderolabs/pkgs.git
 TALOS_REPOSITORY = https://github.com/siderolabs/talos.git
-SBCOVERLAY_REPOSITORY = https://github.com/talos-rpi5/sbc-raspberrypi5.git
+SBCOVERLAY_REPOSITORY = https://github.com/siderolabs/sbc-raspberrypi

 CHECKOUTS_DIRECTORY := $(PWD)/checkouts
 PATCHES_DIRECTORY := $(PWD)/patches

 PKGS_TAG = $(shell cd $(CHECKOUTS_DIRECTORY)/pkgs && git describe --tag --always --dirty --match v[0-9]\*)
 TALOS_TAG = $(shell cd $(CHECKOUTS_DIRECTORY)/talos && git describe --tag --always --dirty --match v[0-9]\*)
-SBCOVERLAY_TAG = $(shell cd $(CHECKOUTS_DIRECTORY)/sbc-raspberrypi5 && git describe --tag --always --dirty)-$(PKGS_TAG)
+SBCOVERLAY_TAG = $(shell cd $(CHECKOUTS_DIRECTORY)/sbc-raspberrypi && git describe --tag --always --dirty --match v[0-9]\*)

 #
 # Help
@@ -37,17 +35,15 @@ SBCOVERLAY_TAG = $(shell cd $(CHECKOUTS_DIRECTORY)/sbc-raspberrypi5 && git descr
 .PHONY: help
 help:
 	@echo "checkouts      : Clone repositories required for the build"
-	@echo "patches-pi5    : Apply all patches for Raspberry Pi 5"
-	@echo "patches-pi4    : Apply all patches for Raspberry Pi 4"
+	@echo "patches        : Apply all patches for Raspberry Pi 5"
 	@echo "kernel         : Build kernel"
 	@echo "overlay        : Build Raspberry Pi 5 overlay"
 	@echo "imager         : Build imager docker image"
 	@echo "installer-base : Build installer-base docker image"
 	@echo "kern_initramfs : Build kernel and initramfs"
-	@echo "installer-pi5  : Build installer/image for Raspberry Pi 5"
-	@echo "installer-pi4  : Build installer/image for Raspberry Pi 4"
+	@echo "installer      : Build installer"
+	@echo "image          : Build disk image for Raspberry Pi 5"
 	@echo "pi5            : Full build pipeline for Raspberry Pi 5"
-	@echo "pi4            : Full build pipeline for Raspberry Pi 4"
 	@echo "release        : Use only when building the final release, this will tag relevant images with the current Git tag."
 	@echo "clean          : Clean up any remains"

@@ -58,41 +54,30 @@ help:
 checkouts:
 	git clone -c advice.detachedHead=false --branch "$(PKG_VERSION)" "$(PKG_REPOSITORY)" "$(CHECKOUTS_DIRECTORY)/pkgs"
 	git clone -c advice.detachedHead=false --branch "$(TALOS_VERSION)" "$(TALOS_REPOSITORY)" "$(CHECKOUTS_DIRECTORY)/talos"
-	git clone -c advice.detachedHead=false --branch "$(SBCOVERLAY_VERSION)" "$(SBCOVERLAY_REPOSITORY)" "$(CHECKOUTS_DIRECTORY)/sbc-raspberrypi5"
+	git clone -c advice.detachedHead=false --branch "$(SBCOVERLAY_VERSION)" "$(SBCOVERLAY_REPOSITORY)" "$(CHECKOUTS_DIRECTORY)/sbc-raspberrypi"

 checkouts-clean:
 	rm -rf "$(CHECKOUTS_DIRECTORY)/pkgs"
 	rm -rf "$(CHECKOUTS_DIRECTORY)/talos"
-	rm -rf "$(CHECKOUTS_DIRECTORY)/sbc-raspberrypi5"
+	rm -rf "$(CHECKOUTS_DIRECTORY)/sbc-raspberrypi"

 #
 # Patches
 #
-.PHONY: patches-pkgs patches-talos patches patches-pkgs-4 patches-pi4 patches-pi5
+.PHONY: patches-pkgs patches-talos patches patches
 patches-pkgs:
 	cd "$(CHECKOUTS_DIRECTORY)/pkgs" && \
 		git am "$(PATCHES_DIRECTORY)/siderolabs/pkgs/0001-Patched-for-Raspberry-Pi-5.patch"
-	cd "$(CHECKOUTS_DIRECTORY)/pkgs" && \
-		git apply $(PATCHES_DIRECTORY)/siderolabs/pkgs/0003-nf-bridge.patch

 patches-talos:
 	cd "$(CHECKOUTS_DIRECTORY)/talos" && \
 		git am "$(PATCHES_DIRECTORY)/siderolabs/talos/0001-Patched-for-Raspberry-Pi-5.patch"

-patches-pi5: patches-pkgs patches-talos
-
-patches-pkgs-4:
-	cd "$(CHECKOUTS_DIRECTORY)/pkgs" && \
-		git apply "$(PATCHES_DIRECTORY)/siderolabs/pkgs/0002-Patched-for-Raspberry-Pi-4.patch"
-
-patches-pi4: patches-pkgs patches-pkgs-4 patches-talos
+patches: patches-pkgs patches-talos

 # Backwards-compatible alias
-patches: patches-pi5
+patches: patches

-#
-# Kernel
-#
 .PHONY: kernel
 kernel:
 	cd "$(CHECKOUTS_DIRECTORY)/pkgs" && \
@@ -101,18 +86,15 @@ kernel:
 			PLATFORM=linux/arm64 \
 			kernel

-#
-# Overlay
-#
 .PHONY: overlay
 overlay:
 	@echo SBCOVERLAY_TAG = $(SBCOVERLAY_TAG)
-	cd "$(CHECKOUTS_DIRECTORY)/sbc-raspberrypi5" && \
+	cd "$(CHECKOUTS_DIRECTORY)/sbc-raspberrypi" && \
 		$(MAKE) \
 			REGISTRY=$(REGISTRY) USERNAME=$(REGISTRY_USERNAME) IMAGE_TAG=$(SBCOVERLAY_TAG) PUSH=$(PUSH) \
 			PKGS_PREFIX=$(REGISTRY)/$(REGISTRY_USERNAME) PKGS=$(PKGS_TAG) \
 			INSTALLER_ARCH=arm64 PLATFORM=linux/arm64 \
-			sbc-raspberrypi5
+			sbc-raspberrypi

 .PHONY: imager
 imager:
@@ -141,39 +123,27 @@ kern_initramfs:
 			INSTALLER_ARCH=arm64 PLATFORM=linux/arm64 SED=$(SED) \
 			kernel initramfs

-#
-# Installer/Image
-#
-.PHONY: installer-pi5
-installer-pi5:
-	cd "$(CHECKOUTS_DIRECTORY)/talos" && \
-		docker \
-			run --rm -t -v ./_out:/out -v /dev:/dev --privileged $(REGISTRY)/$(REGISTRY_USERNAME)/imager:$(TALOS_TAG) \
-			$(ASSET_TYPE) --arch arm64 \
-			--base-installer-image="$(REGISTRY)/$(REGISTRY_USERNAME)/installer-base:$(TALOS_TAG)" \
-			--overlay-name="rpi5" \
-			--overlay-image="$(REGISTRY)/$(REGISTRY_USERNAME)/sbc-raspberrypi5:$(SBCOVERLAY_TAG)" \
-			$(EXTENSION_ARGS)
-
-.PHONY: installer-pi4
-installer-pi4:
-	cd "$(CHECKOUTS_DIRECTORY)/talos" && \
-		docker \
-			run --rm -t -v ./_out:/out -v /dev:/dev --privileged $(REGISTRY)/$(REGISTRY_USERNAME)/imager:$(TALOS_TAG) \
-			$(ASSET_TYPE) --arch arm64 \
-			--base-installer-image="$(REGISTRY)/$(REGISTRY_USERNAME)/installer-base:$(TALOS_TAG)" \
-			--overlay-name="rpi_generic" \
-			--overlay-image="$(SBCOVERLAY_PI4_IMAGE)" \
-			--overlay-option="configTxtAppend=$(CONFIG_TXT)" \
-			$(EXTENSION_ARGS)
-
-# Backwards-compatible alias
 .PHONY: installer
-installer: installer-pi5
+installer:
+	cd "$(CHECKOUTS_DIRECTORY)/talos" && \
+		$(MAKE) \
+			REGISTRY=$(REGISTRY) USERNAME=$(REGISTRY_USERNAME) PUSH=$(PUSH) \
+			PKG_KERNEL=$(REGISTRY)/$(REGISTRY_USERNAME)/kernel:$(PKGS_TAG) \
+			INSTALLER_ARCH=arm64 PLATFORM=linux/arm64 SED=$(SED) \
+			installer
+
+.PHONY: image
+image:
+	cd "$(CHECKOUTS_DIRECTORY)/talos" && \
+		docker \
+			run --rm -t -v ./_out:/out -v /dev:/dev --privileged $(REGISTRY)/$(REGISTRY_USERNAME)/imager:$(TALOS_TAG) \
+			$(ASSET_TYPE) --arch arm64 \
+			--base-installer-image="$(REGISTRY)/$(REGISTRY_USERNAME)/installer:$(TALOS_TAG)" \
+			--overlay-name="rpi_5" \
+			--overlay-image="$(REGISTRY)/$(REGISTRY_USERNAME)/sbc-raspberrypi:$(SBCOVERLAY_TAG)" \
+			--overlay-option="configTxtAppend=$$CONFIG_TXT" \
+			$(EXTENSION_ARGS)

-#
-# Release
-#
 .PHONY: release
 release:
 	docker pull $(REGISTRY)/$(REGISTRY_USERNAME)/installer:$(TALOS_TAG) && \
@@ -181,13 +151,7 @@ release:
 		docker push $(REGISTRY)/$(REGISTRY_USERNAME)/installer:$(TAG)

 .PHONY: pi5
-pi5: checkouts-clean checkouts patches-pi5 kernel kern_initramfs installer-base imager overlay installer-pi5
+pi5: checkouts-clean checkouts patches kernel kern_initramfs installer-base imager overlay installer image

-.PHONY: pi4
-pi4: checkouts-clean checkouts patches-pi4 kernel kern_initramfs installer-base imager installer-pi4
-
-#
-# Clean
-#
 .PHONY: clean
 clean: checkouts-clean