fix: util-linux pkg name

Suffix `-tools` to util-linux extension to not conflict with `pkgs`. Also change versioning to match Talos version since libs come from Talos. Signed-off-by: Noel Georgi <git@frezbo.dev>
siderolabs · Sep 4, 2023 · 0cba1b6 · 0cba1b6
1 parent 89f857d
commit 0cba1b6
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ endif
 
 # keep in sync with Pkgfile
 BLDR_RELEASE ?= v0.2.0
-PKGS ?= v1.6.0-alpha.0-8-gcca80b7
+PKGS ?= v1.6.0-alpha.0-10-gd3d7d29
 
 BUILD := docker buildx build
 PLATFORM ?= linux/amd64,linux/arm64
@@ -59,7 +59,7 @@ TARGETS = \
 		tailscale \
 		thunderbolt \
 		usb-modem-drivers \
-		util-linux \
+		util-linux-tools \
 		zfs
 
 # Temporarily disabled, as mellanox-ofed fails to build with Linux 6.1

diff --git a/Pkgfile b/Pkgfile
@@ -7,6 +7,7 @@ vars:
   LINUX_FIRMWARE_VERSION: "20230804" # update this when updating PKGS_VERSION in Makefile
   DRBD_DRIVER_VERSION: 9.2.4 # update this when updating PKGS_VERSION in Makefile
   ZFS_DRIVER_VERSION: 2.1.12 # update this when updating PKGS_VERSION in Makefile
+  UTIL_LINUX_VERSION: 2.39.2 # update this when updating PKGS_VERSION in Makefile
 
   # renovate: datasource=git-tags extractVersion=^libtiprc-(?<version>.*)$ depName=git://linux-nfs.org/~steved/libtirpc
   LIBTIRPC_VERSION: 1-3-3

diff --git a/README.md b/README.md
@@ -73,6 +73,12 @@ All system extensions provided by Sidero Labs can be found in the [ghcr.io regis
 | [nvidia-fabricmanager](nvidia-gpu/nvidia-fabricmanager/)         | [NVIDIA fabric manager](https://docs.nvidia.com/datacenter/tesla/pdf/fabric-manager-user-guide.pdf) support for GPU workloads      | `driver version`                   |
 | [nvidia-open-gpu-kernel-modules](nvidia-gpu/nvidia-modules/)     | NVIDIA driver kernel modules                                                                                                       | `driver version`-`talos version`   |
 
+#### Tools
+
+| Name                                  | Description                        | Version Format  |
+| ------------------------------------- | ---------------------------------- | --------------- |
+| [util-linux-tools](tools/util-linux/) | Util Linux tools (only fstrim now) | `talos version` |
+
 ## Building Extensions
 
 In the current form, building extensions requires the use of our [bldr](https://github.com/siderolabs/bldr) tool.

diff --git a/deps.png b/deps.png
diff --git a/hack/release.toml b/hack/release.toml
@@ -15,6 +15,12 @@ See [Talos Linux documentation](https://www.talos.dev/v1.6/talos-guides/configur
 """
 
 [notes]
+    [notes.util-linux-tools]
+        title = "Util Linux Tools"
+        description = """\
+Util Linux Tools is now shipped as a system extension. Includes fstrim only.
+"""
+
     [notes.intel-ice-firmware]
         title = "Intel ICE firmware"
         description = """\

diff --git a/tools/util-linux/manifest.yaml b/tools/util-linux/manifest.yaml
@@ -1,6 +1,6 @@
 version: v1alpha1
 metadata:
-  name: util-linux
+  name: util-linux-tools
   version: "$VERSION"
   author: Sidero Labs
   description: |

diff --git a/tools/util-linux/pkg.yaml b/tools/util-linux/pkg.yaml
@@ -1,4 +1,4 @@
-name: util-linux
+name: util-linux-tools
 variant: scratch
 shell: /toolchain/bin/bash
 dependencies:

diff --git a/tools/util-linux/vars.yaml b/tools/util-linux/vars.yaml
@@ -1 +1 @@
-VERSION: "{{ .UTIL_LINUX_VERSION }}"
+VERSION: "{{ .BUILD_ARG_TAG }}"
diff --git a/tools/vars.yaml b/tools/vars.yaml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		VERSION: "{{ .UTIL_LINUX_VERSION }}"
		VERSION: "{{ .BUILD_ARG_TAG }}"