lukaszraczylo/talos-builder
1
0
Fork 0
mirror of https://github.com/lukaszraczylo/talos-builder.git synced 2026-07-06 05:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to pi foundation kernel 6.18.21 and siderolabs/sbc-raspberrypi overlay

Browse Source
This commit is contained in:
local-build
2026-04-08 12:49:54 -05:00
parent 47bbcddbd4
commit 7a8cbf25a8
6 changed files with 301 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/siderolabs/talos/0002-Makefile.patch
+29 -17
View File
@@ -1,31 +1,40 @@
From 5a381d7f8a423133557c08ec4bd5e2cb7d57fd57 Mon Sep 17 00:00:00 2001
From: local-build <local@build>
Date: Wed, 8 Apr 2026 12:31:42 -0500
Subject: [PATCH] Makefile
---
Makefile | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index e5e5be5d2..72fd7cd02 100644
index bcad98f2b..7ee6bdbfe 100644
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,12 @@ NAME = Talos
CLOUD_IMAGES_EXTRA_ARGS ?= ""
ZSTD_COMPRESSION_LEVEL ?= 18
-CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 -- 2>/dev/null | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$/\1/; t; Q")
+CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 -- 2>/dev/null | head -n 1 | $(SED) -r "/^release\(.*\)/ s/^release\((.*)\):.*$/\1/; t; Q")
ARTIFACTS := _out
@@ -14,10 +14,12 @@ BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
REGISTRY_AND_USERNAME := $(IMAGE_REGISTRY)/$(USERNAME)
NAME = Talos
+SED ?= sed
+
DEBUG_TOOLS_SOURCE := scratch
EMBED_TARGET ?= embed
CLOUD_IMAGES_EXTRA_ARGS ?= ""
ZSTD_COMPRESSION_LEVEL ?= 18
@@ -122,7 +124,7 @@ TEXTLINT_RULE_ONE_SENTENCE_PER_LINE_VERSION ?= 2.0.0
# renovate: datasource=docker depName=hugomods/hugo
HUGO_VERSION ?= dart-sass-0.145.0
-CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 -- 2>/dev/null | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$$/\\1/; t; Q")
+CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 -- 2>/dev/null | head -n 1 | $(SED) -r "/^release\(.*\)/ s/^release\((.*)\):.*$$/\\1/; t; Q")
ARTIFACTS := _out
@@ -94,7 +96,7 @@ GO_VERSION ?= 1.25
# renovate: datasource=npm depName=markdownlint-cli
MARKDOWNLINTCLI_VERSION ?= 0.45.0
OPERATING_SYSTEM := $(shell uname -s | tr "[:upper:]" "[:lower:]")
-ARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
+ARCH := $(shell uname -m | $(SED) 's/x86_64/amd64/' | $(SED) 's/aarch64/arm64/')
TALOSCTL_DEFAULT_TARGET := talosctl-$(OPERATING_SYSTEM)
TALOSCTL_EXECUTABLE := $(PWD)/$(ARTIFACTS)/$(TALOSCTL_DEFAULT_TARGET)-$(ARCH)
INTEGRATION_TEST := integration-test
@@ -371,7 +373,7 @@ docker-%: ## Builds the specified target defined in the Dockerfile using the doc
@@ -331,7 +333,7 @@ docker-%: ## Builds the specified target defined in the Dockerfile using the doc
@$(MAKE) target-$* TARGET_ARGS="--output type=docker,dest=$(DEST)/$*.tar,name=$(REGISTRY_AND_USERNAME)/$*:$(IMAGE_TAG_OUT) $(TARGET_ARGS)"
registry-%: ## Builds the specified target defined in the Dockerfile using the image/registry output type. The build result will be pushed to the registry if PUSH=true.
@@ -34,7 +43,7 @@ index e5e5be5d2..72fd7cd02 100644
hack-test-%: ## Runs the specified script in ./hack/test with well known environment variables.
@./hack/test/$*.sh
@@ -739,7 +741,7 @@ reproducibility-test-docker-%: $(ARTIFACTS)
@@ -695,7 +697,7 @@ reproducibility-test-docker-%: $(ARTIFACTS)
@mkdir -p _out1/ _out2/
@$(MAKE) docker-$* DEST=_out1/
@$(MAKE) docker-$* DEST=_out2/ TARGET_ARGS="--no-cache"
@@ -43,7 +52,7 @@ index e5e5be5d2..72fd7cd02 100644
@rm -rf _out1/ _out2/
reproducibility-test-local-%: $(ARTIFACTS)
@@ -747,7 +749,7 @@ reproducibility-test-local-%: $(ARTIFACTS)
@@ -703,7 +705,7 @@ reproducibility-test-local-%: $(ARTIFACTS)
@mkdir -p _out1/ _out2/
@$(MAKE) local-$* DEST=_out1/
@$(MAKE) local-$* DEST=_out2/ TARGET_ARGS="--no-cache"
@@ -52,3 +61,6 @@ index e5e5be5d2..72fd7cd02 100644
@rm -rf _out1/ _out2/
reproducibility-test-iso: $(ARTIFACTS)
--
2.50.1 (Apple Git-155)