Skip to content

Commit c479d91

Browse files
committed
fix: build of nfsrahead extension
It was completely broken: * missing validator * missing manifest * incorrect version * wrong install prefix Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 7351b9d commit c479d91

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

.kres.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ spec:
8383
- name: EXTENSIONS_IMAGE_REF
8484
defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
8585
- name: PKGS
86-
defaultValue: v1.11.0-alpha.0-51-g383bbb4
86+
defaultValue: v1.11.0
8787
- name: PKGS_PREFIX
8888
defaultValue: ghcr.io/siderolabs
8989
- name: TOOLS
90-
defaultValue: v1.11.0-alpha.0-8-g650b916
90+
defaultValue: v1.11.0
9191
- name: TOOLS_PREFIX
9292
defaultValue: ghcr.io/siderolabs
9393
useBldrPkgTagResolver: true

Makefile

Lines changed: 3 additions & 3 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-16T10:58:37Z by kres b869533.
3+
# Generated on 2025-07-17T17:08:14Z by kres b869533.
44

55
# common variables
66

@@ -50,9 +50,9 @@ COMMON_ARGS += --build-arg=TOOLS_PREFIX="$(TOOLS_PREFIX)"
5050
# extra variables
5151

5252
EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
53-
PKGS ?= v1.11.0-alpha.0-51-g383bbb4
53+
PKGS ?= v1.11.0
5454
PKGS_PREFIX ?= ghcr.io/siderolabs
55-
TOOLS ?= v1.11.0-alpha.0-8-g650b916
55+
TOOLS ?= v1.11.0
5656
TOOLS_PREFIX ?= ghcr.io/siderolabs
5757

5858
# targets defines all the available targets

go.work.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
77
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
88
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
99
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
10-
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
11-
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
10+
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
11+
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
1212
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

storage/nfsrahead/pkg.yaml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ dependencies:
1111
from: /rootfs
1212
steps:
1313
- sources:
14-
- url: https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/{{ .NFS_UTILS_VERSION | replace "-" "." }}/nfs-utils-{{ .NFS_UTILS_VERSION | replace "-" "." }}.tar.xz
14+
- url: https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/{{ .VERSION }}/nfs-utils-{{ .VERSION }}.tar.xz
1515
destination: nfs-utils.tar.xz
1616
sha256: {{ .NFS_UTILS_SHA256 }}
1717
sha512: {{ .NFS_UTILS_SHA512 }}
1818
env:
1919
PKG_CONFIG_PATH: /usr/local/lib/pkgconfig
2020
prepare:
21+
- |
22+
sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml
2123
- |
2224
tar -xf nfs-utils.tar.xz --strip-components=1
2325
@@ -37,7 +39,8 @@ steps:
3739
--disable-uuid \
3840
--enable-junction=no \
3941
--with-nfsconfig=/usr/local/etc/nfsrahead/nfs.conf \
40-
--with-rpcgen=internal
42+
--with-rpcgen=internal \
43+
--prefix=/usr/local
4144
build:
4245
- |
4346
make -C support/nfs
@@ -48,6 +51,14 @@ steps:
4851
cp /pkg/files/nfs.conf /rootfs/usr/local/etc/nfsrahead/nfs.conf
4952
make -C tools/nfsrahead DESTDIR=/rootfs install
5053
rm -rf /rootfs/usr/share
54+
test:
55+
- |
56+
mkdir -p /extensions-validator-rootfs
57+
cp -r /rootfs/ /extensions-validator-rootfs/rootfs
58+
cp /pkg/manifest.yaml /extensions-validator-rootfs/manifest.yaml
59+
/extensions-validator validate --rootfs=/extensions-validator-rootfs --pkg-name="${PKG_NAME}"
5160
finalize:
5261
- from: /rootfs
5362
to: /rootfs
63+
- from: /pkg/manifest.yaml
64+
to: /

storage/nfsrahead/vars.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION: {{ .NFS_UTILS_VERSION }}
1+
VERSION: {{ .NFS_UTILS_VERSION | replace "-" "." }}

0 commit comments

Comments
 (0)