fix: build of nfsrahead extension

It was completely broken:

* missing validator
* missing manifest
* incorrect version
* wrong install prefix

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
This commit is contained in:
Andrey Smirnov 2025-07-17 20:46:09 +04:00
parent 7351b9d4d5
commit c479d91284
No known key found for this signature in database
GPG Key ID: FE042E3D4085A811
5 changed files with 21 additions and 10 deletions

View File

@ -83,11 +83,11 @@ spec:
- name: EXTENSIONS_IMAGE_REF
defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
- name: PKGS
defaultValue: v1.11.0-alpha.0-51-g383bbb4
defaultValue: v1.11.0
- name: PKGS_PREFIX
defaultValue: ghcr.io/siderolabs
- name: TOOLS
defaultValue: v1.11.0-alpha.0-8-g650b916
defaultValue: v1.11.0
- name: TOOLS_PREFIX
defaultValue: ghcr.io/siderolabs
useBldrPkgTagResolver: true

View File

@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2025-07-16T10:58:37Z by kres b869533.
# Generated on 2025-07-17T17:08:14Z by kres b869533.
# common variables
@ -50,9 +50,9 @@ COMMON_ARGS += --build-arg=TOOLS_PREFIX="$(TOOLS_PREFIX)"
# extra variables
EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
PKGS ?= v1.11.0-alpha.0-51-g383bbb4
PKGS ?= v1.11.0
PKGS_PREFIX ?= ghcr.io/siderolabs
TOOLS ?= v1.11.0-alpha.0-8-g650b916
TOOLS ?= v1.11.0
TOOLS_PREFIX ?= ghcr.io/siderolabs
# targets defines all the available targets

View File

@ -7,6 +7,6 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

View File

@ -11,13 +11,15 @@ dependencies:
from: /rootfs
steps:
- sources:
- url: https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/{{ .NFS_UTILS_VERSION | replace "-" "." }}/nfs-utils-{{ .NFS_UTILS_VERSION | replace "-" "." }}.tar.xz
- url: https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/{{ .VERSION }}/nfs-utils-{{ .VERSION }}.tar.xz
destination: nfs-utils.tar.xz
sha256: {{ .NFS_UTILS_SHA256 }}
sha512: {{ .NFS_UTILS_SHA512 }}
env:
PKG_CONFIG_PATH: /usr/local/lib/pkgconfig
prepare:
- |
sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml
- |
tar -xf nfs-utils.tar.xz --strip-components=1
@ -37,7 +39,8 @@ steps:
--disable-uuid \
--enable-junction=no \
--with-nfsconfig=/usr/local/etc/nfsrahead/nfs.conf \
--with-rpcgen=internal
--with-rpcgen=internal \
--prefix=/usr/local
build:
- |
make -C support/nfs
@ -48,6 +51,14 @@ steps:
cp /pkg/files/nfs.conf /rootfs/usr/local/etc/nfsrahead/nfs.conf
make -C tools/nfsrahead DESTDIR=/rootfs install
rm -rf /rootfs/usr/share
test:
- |
mkdir -p /extensions-validator-rootfs
cp -r /rootfs/ /extensions-validator-rootfs/rootfs
cp /pkg/manifest.yaml /extensions-validator-rootfs/manifest.yaml
/extensions-validator validate --rootfs=/extensions-validator-rootfs --pkg-name="${PKG_NAME}"
finalize:
- from: /rootfs
to: /rootfs
- from: /pkg/manifest.yaml
to: /

View File

@ -1 +1 @@
VERSION: {{ .NFS_UTILS_VERSION }}
VERSION: {{ .NFS_UTILS_VERSION | replace "-" "." }}