Skip to content

Commit 650b916

Browse files
committed
chore: bump toolchain, update names in SBOM
Override names of packages copied to pkgs to not include tools- prefix Signed-off-by: Dmitrii Sharshakov <[email protected]>
1 parent 594704b commit 650b916

File tree

11 files changed

+13
-4
lines changed

11 files changed

+13
-4
lines changed

Makefile

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 2025-07-15T10:55:25Z by kres c691b83.
3+
# Generated on 2025-07-15T13:05:16Z by kres b869533.
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.0
28+
BLDR_RELEASE := v0.5.1
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

Pkgfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# syntax = ghcr.io/siderolabs/bldr:v0.5.0
1+
# syntax = ghcr.io/siderolabs/bldr:v0.5.1
22

33
# Sync bldr image with Makefile
44

55
format: v1alpha2
66

77
vars:
8-
TOOLCHAIN_IMAGE: ghcr.io/siderolabs/toolchain:v1.11.0-alpha.0-6-g44ba1dd
8+
TOOLCHAIN_IMAGE: ghcr.io/siderolabs/toolchain:v1.11.0-alpha.0-7-g149a96f
99

1010
# stick to whatever version protobuf requires, see https://github.com/protocolbuffers/protobuf/blob/33d0cd03571aca25adf11d3a62add1d52d1cc27d/cmake/dependencies.cmake#L15
1111
# renovate: datasource=github-releases depName=abseil/abseil-cpp

tools-kmod/pkg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ steps:
4040
fhs-validator /rootfs
4141
sbom:
4242
outputPath: /rootfs/usr/share/spdx/kmod.spdx.json
43+
name: kmod
4344
version: {{ .kmod_version }}
4445
cpes:
4546
- cpe:2.3:a:kernel:kmod:{{ .kmod_version }}:*:*:*:*:*:*:*

tools-libcap/pkg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ steps:
2525
fhs-validator /rootfs
2626
sbom:
2727
outputPath: /rootfs/usr/share/spdx/libcap.spdx.json
28+
name: libcap
2829
version: {{ .libcap_version }}
2930
cpes:
3031
- cpe:2.3:a:libcap_project:libcap:{{ .libcap_version }}:*:*:*:*:*:*:*

tools-libselinux/pkg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ steps:
3232
fhs-validator /rootfs
3333
sbom:
3434
outputPath: /rootfs/usr/share/spdx/libselinux.spdx.json
35+
name: libselinux
3536
version: {{ .selinux_version }}
3637
cpes:
3738
- cpe:2.3:a:selinuxproject:libselinux:{{ .selinux_version }}:*:*:*:*:*:*:*

tools-libsepol/pkg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ steps:
2828
fhs-validator /rootfs
2929
sbom:
3030
outputPath: /rootfs/usr/share/spdx/libsepol.spdx.json
31+
name: libsepol
3132
version: {{ .selinux_version }}
3233
cpes:
3334
- cpe:2.3:a:selinuxproject:libsepol:{{ .selinux_version }}:*:*:*:*:*:*:*

tools-openssl/pkg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ steps:
5050
fhs-validator /rootfs
5151
sbom:
5252
outputPath: /rootfs/usr/share/spdx/openssl.spdx.json
53+
name: openssl
5354
version: {{ .openssl_version }}
5455
cpes:
5556
- cpe:2.3:a:openssl:openssl:{{ .openssl_version }}:*:*:*:*:*:*:*

tools-pcre2/pkg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ steps:
3737
fhs-validator /rootfs
3838
sbom:
3939
outputPath: /rootfs/usr/share/spdx/pcre2.spdx.json
40+
name: pcre2
4041
version: {{ .pcre2_version }}
4142
cpes:
4243
- cpe:2.3:a:pcre:pcre2:{{ .pcre2_version }}:*:*:*:*:*:*:*

tools-tar/pkg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ steps:
3333
fhs-validator /rootfs
3434
sbom:
3535
outputPath: /rootfs/usr/share/spdx/tar.spdx.json
36+
name: tar
3637
version: {{ .tar_version }}
3738
cpes:
3839
- cpe:2.3:a:gnu:tar:{{ .tar_version }}:*:*:*:*:*:*:*

tools-util-linux/pkg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ steps:
4949
fhs-validator /rootfs
5050
sbom:
5151
outputPath: /rootfs/usr/share/spdx/util-linux.spdx.json
52+
name: util-linux
5253
version: {{ .util_linux_version }}
5354
cpes:
5455
- cpe:2.3:a:kernel:util-linux:{{ .util_linux_version }}:*:*:*:*:*:*:*

0 commit comments

Comments
 (0)