feat: use bootstrapped packages for building Talos

Update tools, pkgs and extras to use fully bootstrapped [Stageˣ]-derived toolchain for building Talos and its dependencies.

This brings in changes related to root being usrmerged now, so some paths have changed. Extras have been cleaned up: use only the needed package.

Addresses: #10187

Signed-off-by: Dmitry Sharshakov <dmitry.sharshakov@siderolabs.com>

Author: dsseng

Dockerfile

@@ -17,14 +17,14 @@ 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")
 
 ARTIFACTS := _out
-TOOLS ?= ghcr.io/siderolabs/tools:v1.10.0-alpha.0-7-g7200845
+TOOLS ?= ghcr.io/siderolabs/tools:v1.10.0-alpha.0-10-g9db33dd
 
 DEBUG_TOOLS_SOURCE := scratch
 EMBED_TARGET ?= embed
 
 PKGS_PREFIX ?= ghcr.io/siderolabs
-PKGS ?= v1.10.0-alpha.0-34-g5763e3e
-EXTRAS ?= v1.10.0-alpha.0-2-gf4a110f
+PKGS ?= v1.10.0-alpha.0-35-g85f8901
+EXTRAS ?= v1.10.0-alpha.0-3-g4102a78
 
 KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
 CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest
@@ -64,7 +64,7 @@ PKG_KMOD ?= $(PKGS_PREFIX)/kmod:$(PKGS)
 PKG_CNI ?= $(PKGS_PREFIX)/cni:$(PKGS)
 PKG_FLANNEL_CNI ?= $(PKGS_PREFIX)/flannel-cni:$(PKGS)
 PKG_KERNEL ?= $(PKGS_PREFIX)/kernel:$(PKGS)
-PKG_TALOSCTL_CNI_BUNDLE_INSTALL ?= $(PKGS_PREFIX)/talosctl-cni-bundle-install:$(EXTRAS)
+PKG_TALOSCTL_CNI_BUNDLE ?= $(PKGS_PREFIX)/talosctl-cni-bundle:$(EXTRAS)
 
 # renovate: datasource=github-tags depName=golang/go
 GO_VERSION ?= 1.23
@@ -267,7 +267,7 @@ COMMON_ARGS += --build-arg=PKG_RASPBERYPI_FIRMWARE=$(PKG_RASPBERYPI_FIRMWARE)
 COMMON_ARGS += --build-arg=PKG_CNI=$(PKG_CNI)
 COMMON_ARGS += --build-arg=PKG_FLANNEL_CNI=$(PKG_FLANNEL_CNI)
 COMMON_ARGS += --build-arg=PKG_KERNEL=$(PKG_KERNEL)
-COMMON_ARGS += --build-arg=PKG_TALOSCTL_CNI_BUNDLE_INSTALL=$(PKG_TALOSCTL_CNI_BUNDLE_INSTALL)
+COMMON_ARGS += --build-arg=PKG_TALOSCTL_CNI_BUNDLE=$(PKG_TALOSCTL_CNI_BUNDLE)
 COMMON_ARGS += --build-arg=ABBREV_TAG=$(ABBREV_TAG)
 COMMON_ARGS += --build-arg=ZSTD_COMPRESSION_LEVEL=$(ZSTD_COMPRESSION_LEVEL)
 COMMON_ARGS += --build-arg=MICROSOFT_SECUREBOOT_RELEASE=$(MICROSOFT_SECUREBOOT_RELEASE)

Makefile

@@ -1,6 +1,6 @@
 module github.com/siderolabs/talos
 
-go 1.23.5
+go 1.23.6
 
 replace (
 	// see e.g. https://github.com/grpc/grpc-go/issues/6696

go.mod

@@ -1,4 +1,4 @@
-go 1.23.5
+go 1.23.6
 
 use (
 	.

go.work

@@ -1,7 +1,4 @@
-#!/toolchain/bin/bash
-
-export PATH=/toolchain/bin
-
+#!/bin/bash
 PREFIX="${1}"
 
 function remove_symlinks() {
@@ -25,16 +22,17 @@ find ${PREFIX} -type f -name \*.la -delete
 find ${PREFIX} -type f \( -name \*.static -o -name \*.o \) -delete
 # Strip debug symbols from all libraries and binaries.
 find ${PREFIX}/{lib,usr/lib} -type f \( -name \*.so* -a ! -name \*dbg \) -exec strip --strip-unneeded {} ';' || true
-find ${PREFIX}/{bin,sbin,usr/bin,usr/sbin} -type f -exec strip --strip-all {} ';' || true
+find ${PREFIX}/usr/bin -type f -exec strip --strip-all {} ';' || true
 
 # Remove header files, man files, and any other non-runtime dependencies.
-rm -rf ${PREFIX}/{lib,usr/lib}/pkgconfig/ \
+rm -rf ${PREFIX}/usr/lib/pkgconfig/ \
        ${PREFIX}/{include,usr/include}/* \
        ${PREFIX}/{share,usr/share}/* \
        ${PREFIX}/usr/lib/cmake \
-       ${PREFIX}/lib/gconv/ \
+       ${PREFIX}/usr/lib/gconv/ \
        ${PREFIX}/usr/libexec/getconf \
        ${PREFIX}/var/db
 
 # Remove contents of /usr/bin except for udevadm
-find ${PREFIX}/usr/bin \( -type f -o -type l \) ! -name udevadm -delete
+# TODO: do not install these files in the first place.
+# find ${PREFIX}/usr/bin \( -type f -o -type l \) ! -name udevadm -delete

hack/cleanup.sh

@@ -1,6 +1,6 @@
 module github.com/siderolabs/cloud-image-uploader
 
-go 1.23.5
+go 1.23.6
 
 require (
 	cloud.google.com/go/storage v1.49.0

hack/cloud-image-uploader/go.mod

@@ -1,6 +1,6 @@
 module github.com/siderolabs/talos-hack-docgen
 
-go 1.23.5
+go 1.23.6
 
 // forked go-yaml that introduces RawYAML interface, which can be used to populate YAML fields using bytes
 // which are then encoded as a valid YAML blocks with proper indentiation

hack/docgen/go.mod

@@ -1,6 +1,6 @@
 module github.com/siderolabs/gotagsrewrite
 
-go 1.23.5
+go 1.23.6
 
 require (
 	github.com/fatih/structtag v1.2.0

hack/gotagsrewrite/go.mod

@@ -1,6 +1,6 @@
-#!/toolchain/bin/bash
+#!/bin/bash
 
 set -e
 # set SELinux labels for files according to file_contexts supplied
-/toolchain/sbin/setfiles -r $1 -F -vv $3 $1
+/sbin/setfiles -r $1 -F -vv $3 $1
 mksquashfs $1 $2 -all-root -noappend -comp zstd -Xcompression-level $4 -no-progress

hack/labeled-squashfs.sh

@@ -1,5 +1,5 @@
 module module-sig-verify
 
-go 1.23.5
+go 1.23.6
 
 require go.mozilla.org/pkcs7 v0.9.0