Skip to content

Commit 6070848

Browse files
authored
Merge branch 'main' into soci
Signed-off-by: Zach Langbert <[email protected]>
2 parents 268ab1e + 313ae03 commit 6070848

File tree

38 files changed

+484
-96
lines changed

38 files changed

+484
-96
lines changed

.conform.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-08-01T17:25:51Z by kres faf91e3.
3+
# Generated on 2025-11-13T15:52:54Z by kres e1d6dac.
44

55
policies:
66
- type: commit
@@ -12,7 +12,7 @@ policies:
1212
gitHubOrganization: siderolabs
1313
spellcheck:
1414
locale: US
15-
maximumOfOneCommit: true
15+
maximumOfOneCommit: false
1616
header:
1717
length: 89
1818
imperative: true

.github/renovate.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@
9797
"matchPackageNames": [
9898
"git://linux-nfs.org/~steved/libtirpc"
9999
]
100+
},
101+
{
102+
"versioning": "regex:^(?<major>\\d+)\\.?(?<minor>\\d+)?\\.?(?<patch>\\d+)?$",
103+
"matchPackageNames": [
104+
"systemd/systemd"
105+
]
100106
}
101107
],
102108
"separateMajorMinor": false

.kres.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ spec:
4444
- nvidia-container-toolkit-production
4545
- nvidia-fabricmanager-lts
4646
- nvidia-fabricmanager-production
47+
- nvidia-gdrdrv-device
4748
- nvidia-open-gpu-kernel-modules-lts
4849
- nvidia-open-gpu-kernel-modules-production
4950
- nvme-cli
@@ -88,11 +89,11 @@ spec:
8889
- name: EXTENSIONS_IMAGE_REF
8990
defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
9091
- name: PKGS
91-
defaultValue: v1.12.0-alpha.0-50-g4ae050a
92+
defaultValue: v1.12.0
9293
- name: PKGS_PREFIX
9394
defaultValue: ghcr.io/siderolabs
9495
- name: TOOLS
95-
defaultValue: v1.12.0-alpha.0-18-g44932c0
96+
defaultValue: v1.12.0
9697
- name: TOOLS_PREFIX
9798
defaultValue: ghcr.io/siderolabs
9899
useBldrPkgTagResolver: true
@@ -293,3 +294,6 @@ spec:
293294
- matchPackageNames:
294295
- git://linux-nfs.org/~steved/libtirpc
295296
versioning: 'regex:^(?<major>\d+)-(?<minor>\d+)-?(?<patch>\d+)?$'
297+
- matchPackageNames:
298+
- systemd/systemd
299+
versioning: 'regex:^(?<major>\d+)\.?(?<minor>\d+)?\.?(?<patch>\d+)?$'

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-11-06T12:58:59Z by kres 4ba9b0c.
3+
# Generated on 2025-11-12T17:46:46Z by kres 911d166.
44

55
# common variables
66

@@ -25,7 +25,7 @@ SOURCE_DATE_EPOCH := $(shell git log $(INITIAL_COMMIT_SHA) --pretty=%ct)
2525

2626
# sync bldr image with pkgfile
2727

28-
BLDR_RELEASE := v0.5.4
28+
BLDR_RELEASE := v0.5.5
2929
BLDR_IMAGE := ghcr.io/siderolabs/bldr:$(BLDR_RELEASE)
3030
BLDR := docker run --rm --user $(shell id -u):$(shell id -g) --volume $(PWD):/src --entrypoint=/bldr $(BLDR_IMAGE) --root=/src
3131

@@ -51,9 +51,9 @@ COMMON_ARGS += $(BUILD_ARGS)
5151
# extra variables
5252

5353
EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
54-
PKGS ?= v1.12.0-alpha.0-50-g4ae050a
54+
PKGS ?= v1.12.0
5555
PKGS_PREFIX ?= ghcr.io/siderolabs
56-
TOOLS ?= v1.12.0-alpha.0-18-g44932c0
56+
TOOLS ?= v1.12.0
5757
TOOLS_PREFIX ?= ghcr.io/siderolabs
5858
IMAGE_SIGNER_RELEASE ?= v0.1.1
5959

@@ -101,6 +101,7 @@ TARGETS += nvidia-container-toolkit-lts
101101
TARGETS += nvidia-container-toolkit-production
102102
TARGETS += nvidia-fabricmanager-lts
103103
TARGETS += nvidia-fabricmanager-production
104+
TARGETS += nvidia-gdrdrv-device
104105
TARGETS += nvidia-open-gpu-kernel-modules-lts
105106
TARGETS += nvidia-open-gpu-kernel-modules-production
106107
TARGETS += nvme-cli

Pkgfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# syntax = ghcr.io/siderolabs/bldr:v0.5.4
1+
# syntax = ghcr.io/siderolabs/bldr:v0.5.5
22

33
format: v1alpha2
44

55
vars:
66
CONTAINERD_VERSION: v2.1.5 # update this when updating PKGS_VERSION in Makefile
7-
LINUX_FIRMWARE_VERSION: "20251021" # update this when updating PKGS_VERSION in Makefile
7+
LINUX_FIRMWARE_VERSION: "20251111" # update this when updating PKGS_VERSION in Makefile
88
DRBD_DRIVER_VERSION: 9.2.15 # update this when updating PKGS_VERSION in Makefile
99
ZFS_DRIVER_VERSION: 2.4.0-rc2 # update this when updating PKGS_VERSION in Makefile
1010
ZFS_TOOLS_SHA256: 6b5b821e03520034b49f965acb198ff4f37661195689326a1c05a4782389987f
@@ -16,10 +16,10 @@ vars:
1616
TENSTORRENT_VERSION: 2.5.0 # update this when updating PKGS_VERSION in Makefile
1717
HAILORT_VERSION: 4.23.0 # update this when updating PKGS_VERSION in Makefile
1818

19-
# renovate: datasource=git-tags extractVersion=^libtiprc-(?<version>.*)$ depName=git://linux-nfs.org/~steved/libtirpc
20-
LIBTIRPC_VERSION: 1-3-7
21-
LIBTIRPC_SHA256: b47d3ac19d3549e54a05d0019a6c400674da716123858cfdb6d3bdd70a66c702
22-
LIBTIRPC_SHA512: 50c0153bc72a3f9578eb7a9dc123ea531df83c455f19b03d2bc59563d8453fcd278a025eef05865d1218b2c9358a9152ee069ce0e4d11dfea4ca0a8a24221fad
19+
# renovate: datasource=git-tags extractVersion=^libtiprc-(?<version>.*)$ depName=git://git.linux-nfs.org/projects/steved/libtirpc.git
20+
LIBTIRPC_VERSION: 1-3-6
21+
LIBTIRPC_SHA256: f9eeeb368d733e11f18ddb750a41bdf9089ba5f9476404da848c2cd295624f0d
22+
LIBTIRPC_SHA512: 1e20007d030df9cde23ae3ab99cabb7977c473f9f08a37154e9f43a15c804826651ada402d2075989df65bfdc55fd7a9bda959120da890df9ccf8111cca5ecc6
2323
# renovate: datasource=github-tags extractVersion=^v(?<version>.*)$ depName=madler/zlib
2424
ZLIB_VERSION: 1.3.1
2525
ZLIB_SHA256: 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23

0 commit comments

Comments
 (0)