From d2bc31b563b6c5d72d1b5a3893aea6c2c7d32063 Mon Sep 17 00:00:00 2001 From: Patrick Hunziker Date: Mon, 30 Jun 2025 12:14:27 +0200 Subject: [PATCH] Talos upgrade to v1.10.4 - Set the TALOS_VERSION to v1.10.4. - Added a .gitignore to avoid committing checkouts/. - Started a manual for upgrading the Talos version. --- .gitignore | 1 + Makefile | 2 +- UPGRADING.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 UPGRADING.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b3dd152 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +checkouts/ diff --git a/Makefile b/Makefile index 13699f5..09ffdbb 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_VERSION = v1.10.0 -TALOS_VERSION = v1.10.2 +TALOS_VERSION = v1.10.4 SBCOVERLAY_VERSION = main REGISTRY ?= ghcr.io diff --git a/UPGRADING.md b/UPGRADING.md new file mode 100644 index 0000000..e369fe4 --- /dev/null +++ b/UPGRADING.md @@ -0,0 +1,47 @@ +# Upgrading Talos +When a new version of Talos is released it may be necessary to adjust the patches we are applying to the upstream repositories. + +1. Make sure you're starting from a clean slate +``` +make clean +``` +2. Update the versions in the _Makefile_ with the latest tag available in siderolabs repositories. +``` +PKG_VERSION = vX.XX.X <-- siderolabs/pkgs +TALOS_VERSION = vX.XX.X <-- siderolabs/talos +``` +3. Clone all checkouts +``` +make checkouts +``` +4. Update patches as outlined bellow +5. Commit and push changes +``` +git commit -am 'Talos upgrade to vX.XX.X' +git push +``` +7. Create new tag +``` +git tag vX.XX.X-rpi5 +git push origin vX.XX.X-rpi5 +``` + +## Pkgs +The [siderolabs/pkgs](https://github.com/siderolabs/pkgs) repository produces a set of packages which is used to build the rootfs. We are concerned about customizing the Kernel package, by using the the [raspberrypi/linux](https://github.com/raspberrypi/linux) kernel . + +**TBD: Will be added next time the pkgs repository is updated** + +## Talos +The [siderolabs/talos](https://github.com/siderolabs/talos) repository is where packages and Talos come together. We'll need to customise the list of available kernel modules to be copied in to the initramfs. + +1. Try to apply the patches. If there are errors proceed to step 2, if not no further changes are needed. +``` +make patches-pkgs +``` +2. Manually add the required changes, commit and regenerate the patch. Essentially the _hack/modules-arm64.txt_ file needs to be overwritten with the one appropriate for the kernel build. +``` +cd cd checkouts/talos +cp hack/modules-arm64.txt +git commit -am '[PATCH] Patched for Raspberry Pi 5' +git format-patch --output-directory "../../patches/siderolabs/talos" HEAD~1 +```