diff --git a/.kres.yaml b/.kres.yaml index b231a00..f31fa0b 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -66,7 +66,7 @@ spec: - name: EXTENSIONS_IMAGE_REF defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG) - name: PKGS - defaultValue: v1.10.0-alpha.0-34-g5763e3e + defaultValue: v1.10.0-alpha.0-35-g85f8901 - name: PKGS_PREFIX defaultValue: ghcr.io/siderolabs useBldrPkgTagResolver: true diff --git a/Makefile b/Makefile index b21415b..9d41d72 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2025-01-31T12:02:15Z by kres 987bf4d. +# Generated on 2025-02-07T11:47:31Z by kres 3bb2b12. # common variables @@ -25,7 +25,7 @@ SOURCE_DATE_EPOCH := $(shell git log $(INITIAL_COMMIT_SHA) --pretty=%ct) # sync bldr image with pkgfile -BLDR_RELEASE := v0.3.2 +BLDR_RELEASE := v0.4.1 BLDR_IMAGE := ghcr.io/siderolabs/bldr:$(BLDR_RELEASE) BLDR := docker run --rm --user $(shell id -u):$(shell id -g) --volume $(PWD):/src --entrypoint=/bldr $(BLDR_IMAGE) --root=/src @@ -48,7 +48,7 @@ COMMON_ARGS += --build-arg=PKGS_PREFIX="$(PKGS_PREFIX)" # extra variables EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG) -PKGS ?= v1.10.0-alpha.0-34-g5763e3e +PKGS ?= v1.10.0-alpha.0-35-g85f8901 PKGS_PREFIX ?= ghcr.io/siderolabs # targets defines all the available targets diff --git a/Pkgfile b/Pkgfile index e866a95..8fac6f9 100644 --- a/Pkgfile +++ b/Pkgfile @@ -1,4 +1,4 @@ -# syntax = ghcr.io/siderolabs/bldr:v0.3.2 +# syntax = ghcr.io/siderolabs/bldr:v0.4.0-1-g76a2c8f format: v1alpha2 diff --git a/README.md b/README.md index 52fca50..03bde4b 100644 --- a/README.md +++ b/README.md @@ -209,9 +209,10 @@ The following restrictions are applied to the contents of the `rootfs` of the sy Any paths in the `rootfs` should be contained within the following hierarchies: - `/etc/cri/conf.d/` -- `/lib/firmware/` -- `/lib/modules/` -- `/lib64/ld-linux-x86-64.so.2` +- `/usr/lib/firmware/` +- `/usr/lib/modules/` +- `/usr/lib/ld-linux-x86-64.so.2` +- `/usr/bin/ldconfig` (used by NVIDIA Container Toolkit) - `/usr/lib/udev/rules.d/` - `/usr/local/` - `/usr/share/glvnd/` diff --git a/container-runtime/crun/pkg.yaml b/container-runtime/crun/pkg.yaml index ea4f8a3..1882f4f 100644 --- a/container-runtime/crun/pkg.yaml +++ b/container-runtime/crun/pkg.yaml @@ -1,6 +1,6 @@ name: crun variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: diff --git a/container-runtime/ecr-credential-provider/pkg.yaml b/container-runtime/ecr-credential-provider/pkg.yaml index c171be8..3cd0390 100644 --- a/container-runtime/ecr-credential-provider/pkg.yaml +++ b/container-runtime/ecr-credential-provider/pkg.yaml @@ -1,6 +1,6 @@ name: ecr-credential-provider variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: @@ -10,10 +10,11 @@ steps: sha256: 0bd75a18faab15dae7a603e1d6b57691953f1b6427f6eaa4c14e9fbfc1a75348 sha512: e85b0c4a79f6c087147a5868520693f7cb98a471d5497dcda27a6e341e719868f5308ccf8d9781e601ff1b52f332a0447033a096c929e768553e937e154db25e env: - GOPATH: /go + GOPATH: /tmp/go cachePaths: - /.cache/go-build - - /go/pkg + - /tmp/go/pkg + - network: default prepare: - | sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml @@ -21,10 +22,12 @@ steps: mkdir -p ${GOPATH}/src/k8s.io/cloud-provider-aws tar -xzf cloud-provider-aws.tar.gz --strip-components=1 -C ${GOPATH}/src/k8s.io/cloud-provider-aws + - | + cd ${GOPATH}/src/k8s.io/cloud-provider-aws + go mod download + - network: none build: - | - export PATH=${PATH}:${TOOLCHAIN}/go/bin - go build \ -C ${GOPATH}/src/k8s.io/cloud-provider-aws \ -o ./dist/ecr-credential-provider \ diff --git a/container-runtime/gvisor-debug/pkg.yaml b/container-runtime/gvisor-debug/pkg.yaml index 8f1df0a..706acb3 100644 --- a/container-runtime/gvisor-debug/pkg.yaml +++ b/container-runtime/gvisor-debug/pkg.yaml @@ -1,6 +1,6 @@ name: gvisor-debug variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: diff --git a/container-runtime/gvisor/pkg.yaml b/container-runtime/gvisor/pkg.yaml index 1eee9aa..1153442 100644 --- a/container-runtime/gvisor/pkg.yaml +++ b/container-runtime/gvisor/pkg.yaml @@ -1,6 +1,6 @@ name: gvisor variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: @@ -12,10 +12,11 @@ steps: sha256: 63419d6c5744f17f8f8229919ed2399e5e8d567735379b22f34acba2cfc8ab34 sha512: 567f72bbf701176e394ca5ad6ba1be8432e56d8f48344dc9561dba668536ca3132c7f9b8a19485b9518d35783b32426318def14e7ca9cc7c682ab26f1db9e293 env: - GOPATH: /go + GOPATH: /tmp/go cachePaths: - /.cache/go-build - - /go/pkg + - /tmp/go/pkg + - network: default prepare: - | sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml @@ -23,9 +24,12 @@ steps: mkdir -p ${GOPATH}/src/github.com/google/gvisor tar -xzf gvisor.tar.gz --strip-components=1 -C ${GOPATH}/src/github.com/google/gvisor + - | + cd ${GOPATH}/src/github.com/google/gvisor + go mod download + - network: none build: - | - export PATH=${PATH}:${TOOLCHAIN}/go/bin cd ${GOPATH}/src/github.com/google/gvisor mkdir ./bin diff --git a/container-runtime/kata-containers/pkg.yaml b/container-runtime/kata-containers/pkg.yaml index af035ed..6d862d8 100644 --- a/container-runtime/kata-containers/pkg.yaml +++ b/container-runtime/kata-containers/pkg.yaml @@ -1,6 +1,6 @@ name: kata-containers variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: @@ -21,10 +21,11 @@ steps: sha256: 6567498577888f29d186d14629e7e987e8afc49ab988c72e0bc80918fe99295a sha512: 54b989b1db27e56266d1e40b18d3c4f353a3f876dad358afecbba7fb7e1238da1f0856c73f627cbb24e36176f784e2a809bb1b7a990ad21644b06e7b43d64a68 env: - GOPATH: /go + GOPATH: /tmp/go cachePaths: - /.cache/go-build - - /go/pkg + - /tmp/go/pkg + - network: default prepare: - | sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml @@ -34,9 +35,12 @@ steps: - | mkdir -p ${GOPATH}/src/github.com/kata-containers tar -xzf kata-containers.tar.gz --strip-components=1 -C ${GOPATH}/src/github.com/kata-containers + - | + cd ${GOPATH}/src/github.com/kata-containers/src/runtime + go mod download + - network: none build: - | - export PATH=${PATH}:${TOOLCHAIN}/go/bin cd ${GOPATH}/src/github.com/kata-containers PREFIX=/usr/local make -C src/runtime SKIP_GO_VERSION_CHECK=y containerd-shim-v2 install: diff --git a/container-runtime/spin/pkg.yaml b/container-runtime/spin/pkg.yaml index c633be0..b889527 100644 --- a/container-runtime/spin/pkg.yaml +++ b/container-runtime/spin/pkg.yaml @@ -1,6 +1,6 @@ name: spin variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: diff --git a/container-runtime/stargz-snapshotter/pkg.yaml b/container-runtime/stargz-snapshotter/pkg.yaml index 8d48f10..33b7938 100644 --- a/container-runtime/stargz-snapshotter/pkg.yaml +++ b/container-runtime/stargz-snapshotter/pkg.yaml @@ -1,6 +1,6 @@ name: stargz-snapshotter variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: @@ -10,10 +10,11 @@ steps: sha256: 576f59d4375ac2cab24310d28e3ac98148c05dc6714649e1ec27e8d4fa8a9679 sha512: 3a8226e29305f55e9244017cd3063e9ba9b8b4a79a404000677e0e99a84d1337b12a37f6d1b5539c9579f54b1c118fb0ce373eb402296a18d8e55474d549986a env: - GOPATH: /go + GOPATH: /tmp/go cachePaths: - /.cache/go-build - - /go/pkg + - /tmp/go/pkg + - network: default prepare: - | sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml @@ -21,9 +22,12 @@ steps: mkdir -p ${GOPATH}/src/github.com/containerd/stargz-snapshotter tar -xzf stargz-snapshotter.tar.gz --strip-components=1 -C ${GOPATH}/src/github.com/containerd/stargz-snapshotter + - | + cd ${GOPATH}/src/github.com/containerd/stargz-snapshotter/cmd + go mod download + - network: none build: - | - export PATH=${PATH}:${TOOLCHAIN}/go/bin cd ${GOPATH}/src/github.com/containerd/stargz-snapshotter make containerd-stargz-grpc diff --git a/container-runtime/wasmedge/pkg.yaml b/container-runtime/wasmedge/pkg.yaml index 559e080..9d5d7a5 100644 --- a/container-runtime/wasmedge/pkg.yaml +++ b/container-runtime/wasmedge/pkg.yaml @@ -1,6 +1,6 @@ name: wasmedge variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: diff --git a/deps.png b/deps.png index de691ed..b7bf2bc 100644 Binary files a/deps.png and b/deps.png differ diff --git a/drivers/chelsio/pkg.yaml b/drivers/chelsio/pkg.yaml index abddd47..355c9af 100644 --- a/drivers/chelsio/pkg.yaml +++ b/drivers/chelsio/pkg.yaml @@ -1,6 +1,6 @@ name: chelsio-drivers variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,16 +12,16 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - export KERNELRELEASE=$(find /lib/modules -type d -name "*-talos" -exec basename {} \+) + export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) mkdir -p /rootfs - xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} - depmod -b /rootfs ${KERNELRELEASE} + xargs -a /pkg/files/modules.txt -I {} install -D /usr/lib/modules/${KERNELRELEASE}/{} /rootfs/usr/lib/modules/${KERNELRELEASE}/{} + depmod -b /rootfs/usr ${KERNELRELEASE} - test: - | # https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping - find /rootfs/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ + find /rootfs/usr/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ - | mkdir -p /extensions-validator-rootfs cp -r /rootfs/ /extensions-validator-rootfs/rootfs diff --git a/drivers/gasket/pkg.yaml b/drivers/gasket/pkg.yaml index 012c8b4..1ec9ee9 100644 --- a/drivers/gasket/pkg.yaml +++ b/drivers/gasket/pkg.yaml @@ -1,6 +1,6 @@ name: gasket-driver variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,9 +12,9 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - mkdir -p /rootfs/lib/modules + mkdir -p /rootfs/usr/lib/modules - cp -R /lib/modules/* /rootfs/lib/modules + cp -R /usr/lib/modules/* /rootfs/usr/lib/modules - test: - | mkdir -p /extensions-validator-rootfs diff --git a/drivers/mei/pkg.yaml b/drivers/mei/pkg.yaml index 116bc5a..8450baa 100644 --- a/drivers/mei/pkg.yaml +++ b/drivers/mei/pkg.yaml @@ -1,6 +1,6 @@ name: mei variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -15,14 +15,14 @@ steps: # {{ if eq .ARCH "x86_64" }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr - install: - | - export KERNELRELEASE=$(find /lib/modules -type d -name "*-talos" -exec basename {} \+) + export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) - xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} - depmod -b /rootfs ${KERNELRELEASE} + xargs -a /pkg/files/modules.txt -I {} install -D /usr/lib/modules/${KERNELRELEASE}/{} /rootfs/usr/lib/modules/${KERNELRELEASE}/{} + depmod -b /rootfs/usr ${KERNELRELEASE} - test: - | # https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping - find /rootfs/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ + find /rootfs/usr/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ - | mkdir -p /extensions-validator-rootfs cp -r /rootfs/ /extensions-validator-rootfs/rootfs diff --git a/drivers/mellanox-ofed/pkg.yaml b/drivers/mellanox-ofed/pkg.yaml index bf4294f..0e13b32 100644 --- a/drivers/mellanox-ofed/pkg.yaml +++ b/drivers/mellanox-ofed/pkg.yaml @@ -1,6 +1,6 @@ name: mellanox-ofed variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,9 +12,9 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - mkdir -p /rootfs/lib/modules + mkdir -p /rootfs/usr/lib/modules - cp -R /lib/modules/* /rootfs/lib/modules + cp -R /usr/lib/modules/* /rootfs/usr/lib/modules - test: - | mkdir -p /extensions-validator-rootfs diff --git a/drivers/thunderbolt/pkg.yaml b/drivers/thunderbolt/pkg.yaml index 9bb45bf..6493226 100644 --- a/drivers/thunderbolt/pkg.yaml +++ b/drivers/thunderbolt/pkg.yaml @@ -1,6 +1,6 @@ name: thunderbolt variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,16 +12,16 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - export KERNELRELEASE=$(find /lib/modules -type d -name "*-talos" -exec basename {} \+) + export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) mkdir -p /rootfs - xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} - depmod -b /rootfs ${KERNELRELEASE} + xargs -a /pkg/files/modules.txt -I {} install -D /usr/lib/modules/${KERNELRELEASE}/{} /rootfs/usr/lib/modules/${KERNELRELEASE}/{} + depmod -b /rootfs/usr ${KERNELRELEASE} - test: - | # https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping - find /rootfs/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ + find /rootfs/usr/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ - | mkdir -p /extensions-validator-rootfs cp -r /rootfs/ /extensions-validator-rootfs/rootfs diff --git a/drivers/uinput/pkg.yaml b/drivers/uinput/pkg.yaml index 70a2dcc..e8a51c7 100644 --- a/drivers/uinput/pkg.yaml +++ b/drivers/uinput/pkg.yaml @@ -1,6 +1,6 @@ name: uinput variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,16 +12,16 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - export KERNELRELEASE=$(find /lib/modules -type d -name "*-talos" -exec basename {} \+) + export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) mkdir -p /rootfs - xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} - depmod -b /rootfs ${KERNELRELEASE} + xargs -a /pkg/files/modules.txt -I {} install -D /usr/lib/modules/${KERNELRELEASE}/{} /rootfs/usr/lib/modules/${KERNELRELEASE}/{} + depmod -b /rootfs/usr ${KERNELRELEASE} - test: - | # https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping - find /rootfs/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ + find /rootfs/usr/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ - | mkdir -p /extensions-validator-rootfs cp -r /rootfs/ /extensions-validator-rootfs/rootfs diff --git a/drivers/usb-modem/pkg.yaml b/drivers/usb-modem/pkg.yaml index 5d4109a..bc17829 100644 --- a/drivers/usb-modem/pkg.yaml +++ b/drivers/usb-modem/pkg.yaml @@ -1,6 +1,6 @@ name: usb-modem-drivers variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,16 +12,16 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - export KERNELRELEASE=$(find /lib/modules -type d -name "*-talos" -exec basename {} \+) + export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) mkdir -p /rootfs - xargs -a /pkg/files/modules-{{ .ARCH }}.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} - depmod -b /rootfs ${KERNELRELEASE} + xargs -a /pkg/files/modules-{{ .ARCH }}.txt -I {} install -D /usr/lib/modules/${KERNELRELEASE}/{} /rootfs/usr/lib/modules/${KERNELRELEASE}/{} + depmod -b /rootfs/usr ${KERNELRELEASE} - test: - | # https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping - find /rootfs/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ + find /rootfs/usr/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ - | mkdir -p /extensions-validator-rootfs cp -r /rootfs/ /extensions-validator-rootfs/rootfs diff --git a/drivers/v4l-uvc/pkg.yaml b/drivers/v4l-uvc/pkg.yaml index 74d7757..3d0244b 100644 --- a/drivers/v4l-uvc/pkg.yaml +++ b/drivers/v4l-uvc/pkg.yaml @@ -1,6 +1,6 @@ name: v4l-uvc-drivers variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,16 +12,16 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - export KERNELRELEASE=$(find /lib/modules -type d -name "*-talos" -exec basename {} \+) + export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) mkdir -p /rootfs - xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} - depmod -b /rootfs ${KERNELRELEASE} + xargs -a /pkg/files/modules.txt -I {} install -D /usr/lib/modules/${KERNELRELEASE}/{} /rootfs/usr/lib/modules/${KERNELRELEASE}/{} + depmod -b /rootfs/usr ${KERNELRELEASE} - test: - | # https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping - find /rootfs/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ + find /rootfs/usr/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ - | mkdir -p /extensions-validator-rootfs cp -r /rootfs/ /extensions-validator-rootfs/rootfs diff --git a/drm/amdgpu/pkg.yaml b/drm/amdgpu/pkg.yaml index 0d8606c..70222fe 100644 --- a/drm/amdgpu/pkg.yaml +++ b/drm/amdgpu/pkg.yaml @@ -1,6 +1,6 @@ name: amdgpu variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -16,16 +16,16 @@ steps: # {{ if eq .ARCH "x86_64" }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr - install: - | - export KERNELRELEASE=$(find /lib/modules -type d -name "*-talos" -exec basename {} \+) + export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) - xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} + xargs -a /pkg/files/modules.txt -I {} install -D /usr/lib/modules/${KERNELRELEASE}/{} /rootfs/usr/lib/modules/${KERNELRELEASE}/{} - | - mkdir -p /rootfs/lib/firmware - cp -R -p /lib/firmware/amdgpu /rootfs/lib/firmware + mkdir -p /rootfs/usr/lib/firmware + cp -R -p /usr/lib/firmware/amdgpu /rootfs/usr/lib/firmware - test: - | # https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping - find /rootfs/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ + find /rootfs/usr/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ - | mkdir -p /extensions-validator-rootfs cp -r /rootfs/ /extensions-validator-rootfs/rootfs diff --git a/drm/i915/pkg.yaml b/drm/i915/pkg.yaml index a3cc091..7fc1f70 100644 --- a/drm/i915/pkg.yaml +++ b/drm/i915/pkg.yaml @@ -1,6 +1,6 @@ name: i915 variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -16,16 +16,16 @@ steps: # {{ if eq .ARCH "x86_64" }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr - install: - | - export KERNELRELEASE=$(find /lib/modules -type d -name "*-talos" -exec basename {} \+) + export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) - xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} + xargs -a /pkg/files/modules.txt -I {} install -D /usr/lib/modules/${KERNELRELEASE}/{} /rootfs/usr/lib/modules/${KERNELRELEASE}/{} - | - mkdir -p /rootfs/lib/firmware - cp -R -p /lib/firmware/i915 /rootfs/lib/firmware + mkdir -p /rootfs/usr/lib/firmware + cp -R -p /usr/lib/firmware/i915 /rootfs/usr/lib/firmware - test: - | # https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping - find /rootfs/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ + find /rootfs/usr/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ - | mkdir -p /extensions-validator-rootfs cp -r /rootfs/ /extensions-validator-rootfs/rootfs diff --git a/dvb/cx23885/pkg.yaml b/dvb/cx23885/pkg.yaml index afd6612..aaa39fc 100644 --- a/dvb/cx23885/pkg.yaml +++ b/dvb/cx23885/pkg.yaml @@ -1,6 +1,6 @@ name: dvb-cx23885 variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - stage: v4l-uvc-drivers @@ -23,24 +23,24 @@ steps: tar xf dvb-firmware.tar.gz install: - | - export KERNELRELEASE=$(find /lib/modules -type d -name "*-talos" -exec basename {} \+) + export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) mkdir -p /rootfs - xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} - depmod -b /rootfs ${KERNELRELEASE} + xargs -a /pkg/files/modules.txt -I {} install -D /usr/lib/modules/${KERNELRELEASE}/{} /rootfs/usr/lib/modules/${KERNELRELEASE}/{} + depmod -b /rootfs/usr ${KERNELRELEASE} - | mkdir -p /rootfs/usr/local/lib/modprobe.d cp /pkg/files/dvb.conf /rootfs/usr/local/lib/modprobe.d/dvb-cx23885.conf - | - mkdir -p /rootfs/lib/firmware - cp dvb-firmware-{{ .LINUX_DVB_FIRMWARE }}/firmware/dvb-demod-si2168-02.fw /rootfs/lib/firmware - cp dvb-firmware-{{ .LINUX_DVB_FIRMWARE }}/firmware/dvb-demod-si2168-b40-01.fw /rootfs/lib/firmware - cp dvb-firmware-{{ .LINUX_DVB_FIRMWARE }}/firmware/v4l-cx23885-avcore-01.fw /rootfs/lib/firmware + mkdir -p /rootfs/usr/lib/firmware + cp dvb-firmware-{{ .LINUX_DVB_FIRMWARE }}/firmware/dvb-demod-si2168-02.fw /rootfs/usr/lib/firmware + cp dvb-firmware-{{ .LINUX_DVB_FIRMWARE }}/firmware/dvb-demod-si2168-b40-01.fw /rootfs/usr/lib/firmware + cp dvb-firmware-{{ .LINUX_DVB_FIRMWARE }}/firmware/v4l-cx23885-avcore-01.fw /rootfs/usr/lib/firmware test: - | # https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping - find /rootfs/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ + find /rootfs/usr/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ - | mkdir -p /extensions-validator-rootfs cp -r /rootfs/ /extensions-validator-rootfs/rootfs diff --git a/examples/hello-world-service/pkg.yaml b/examples/hello-world-service/pkg.yaml index 4a35379..e225990 100644 --- a/examples/hello-world-service/pkg.yaml +++ b/examples/hello-world-service/pkg.yaml @@ -1,21 +1,19 @@ name: hello-world-service variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: - env: - GOPATH: /go + GOPATH: /tmp/go cachePaths: - /.cache/go-build - - /go/pkg + - /tmp/go/pkg prepare: - | sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml build: - | - export PATH=${PATH}:${TOOLCHAIN}/go/bin - cd /pkg/src CGO_ENABLED=0 go build -o ./hello-world . install: diff --git a/firmware/amd-ucode/pkg.yaml b/firmware/amd-ucode/pkg.yaml index 6a543e4..a14e1bb 100644 --- a/firmware/amd-ucode/pkg.yaml +++ b/firmware/amd-ucode/pkg.yaml @@ -1,6 +1,6 @@ name: amd-ucode variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" @@ -10,8 +10,8 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml install: - | - mkdir -p /rootfs/lib/firmware - cp -R -p /lib/firmware/amd-ucode /rootfs/lib/firmware + mkdir -p /rootfs/usr/lib/firmware + cp -R -p /usr/lib/firmware/amd-ucode /rootfs/usr/lib/firmware test: - | mkdir -p /extensions-validator-rootfs diff --git a/firmware/bnx2-bnx2x/pkg.yaml b/firmware/bnx2-bnx2x/pkg.yaml index 6aaac68..e8636fa 100644 --- a/firmware/bnx2-bnx2x/pkg.yaml +++ b/firmware/bnx2-bnx2x/pkg.yaml @@ -1,6 +1,6 @@ name: bnx2-bnx2x variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" @@ -10,9 +10,9 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml install: - | - mkdir -p /rootfs/lib/firmware - cp -R -p /lib/firmware/bnx2 /rootfs/lib/firmware - cp -R -p /lib/firmware/bnx2x /rootfs/lib/firmware + mkdir -p /rootfs/usr/lib/firmware + cp -R -p /usr/lib/firmware/bnx2 /rootfs/usr/lib/firmware + cp -R -p /usr/lib/firmware/bnx2x /rootfs/usr/lib/firmware test: - | mkdir -p /extensions-validator-rootfs diff --git a/firmware/chelsio/pkg.yaml b/firmware/chelsio/pkg.yaml index 0c715b4..e125efd 100644 --- a/firmware/chelsio/pkg.yaml +++ b/firmware/chelsio/pkg.yaml @@ -1,6 +1,6 @@ name: chelsio-firmware variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" @@ -10,9 +10,9 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml install: - | - mkdir -p /rootfs/lib/firmware - cp -R -p /lib/firmware/cxgb3 /rootfs/lib/firmware - cp -R -p /lib/firmware/cxgb4 /rootfs/lib/firmware + mkdir -p /rootfs/usr/lib/firmware + cp -R -p /usr/lib/firmware/cxgb3 /rootfs/usr/lib/firmware + cp -R -p /usr/lib/firmware/cxgb4 /rootfs/usr/lib/firmware test: - | mkdir -p /extensions-validator-rootfs diff --git a/firmware/intel-ice-firmware/pkg.yaml b/firmware/intel-ice-firmware/pkg.yaml index c48dcfb..1bb2ce8 100644 --- a/firmware/intel-ice-firmware/pkg.yaml +++ b/firmware/intel-ice-firmware/pkg.yaml @@ -1,6 +1,6 @@ name: intel-ice-firmware variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" @@ -10,8 +10,8 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml install: - | - mkdir -p /rootfs/lib/firmware/intel/ice/ddp - cp /lib/firmware/intel/ice/ddp/ice-*.pkg /rootfs/lib/firmware/intel/ice/ddp/ice.pkg + mkdir -p /rootfs/usr/lib/firmware/intel/ice/ddp + cp /usr/lib/firmware/intel/ice/ddp/ice-*.pkg /rootfs/usr/lib/firmware/intel/ice/ddp/ice.pkg test: - | mkdir -p /extensions-validator-rootfs diff --git a/firmware/intel-ucode/pkg.yaml b/firmware/intel-ucode/pkg.yaml index bd9ed72..492cc9d 100644 --- a/firmware/intel-ucode/pkg.yaml +++ b/firmware/intel-ucode/pkg.yaml @@ -1,6 +1,6 @@ name: intel-ucode variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: @@ -16,8 +16,8 @@ steps: tar -xzf intel-ucode.tar.gz --strip-components=1 install: - | - mkdir -p /rootfs/lib/firmware - cp -R -p intel-ucode /rootfs/lib/firmware + mkdir -p /rootfs/usr/lib/firmware + cp -R -p intel-ucode /rootfs/usr/lib/firmware test: - | mkdir -p /extensions-validator-rootfs diff --git a/firmware/qlogic-firmware/pkg.yaml b/firmware/qlogic-firmware/pkg.yaml index 8cc0c9e..b7905e4 100644 --- a/firmware/qlogic-firmware/pkg.yaml +++ b/firmware/qlogic-firmware/pkg.yaml @@ -1,6 +1,6 @@ name: qlogic-firmware variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" @@ -10,8 +10,8 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml install: - | - mkdir -p /rootfs/lib/firmware - cp -R -p /lib/firmware/qed /rootfs/lib/firmware + mkdir -p /rootfs/usr/lib/firmware + cp -R -p /usr/lib/firmware/qed /rootfs/usr/lib/firmware test: - | mkdir -p /extensions-validator-rootfs diff --git a/firmware/realtek-firmware/pkg.yaml b/firmware/realtek-firmware/pkg.yaml index 69a9029..2fc023b 100644 --- a/firmware/realtek-firmware/pkg.yaml +++ b/firmware/realtek-firmware/pkg.yaml @@ -1,6 +1,6 @@ name: realtek-firmware variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" @@ -10,11 +10,11 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml install: - | - mkdir -p /rootfs/lib/firmware - cp -R -p /lib/firmware/rtl_bt /rootfs/lib/firmware - cp -R -p /lib/firmware/rtl_nic /rootfs/lib/firmware - cp -R -p /lib/firmware/rtlwifi /rootfs/lib/firmware - cp -R -p /lib/firmware/rtw88 /rootfs/lib/firmware + mkdir -p /rootfs/usr/lib/firmware + cp -R -p /usr/lib/firmware/rtl_bt /rootfs/usr/lib/firmware + cp -R -p /usr/lib/firmware/rtl_nic /rootfs/usr/lib/firmware + cp -R -p /usr/lib/firmware/rtlwifi /rootfs/usr/lib/firmware + cp -R -p /usr/lib/firmware/rtw88 /rootfs/usr/lib/firmware test: - | mkdir -p /extensions-validator-rootfs diff --git a/guest-agents/metal-agent/pkg.yaml b/guest-agents/metal-agent/pkg.yaml index d8db5e4..957ff03 100644 --- a/guest-agents/metal-agent/pkg.yaml +++ b/guest-agents/metal-agent/pkg.yaml @@ -1,5 +1,6 @@ name: metal-agent variant: scratch +shell: /bin/bash dependencies: - stage: base diff --git a/guest-agents/qemu-guest-agent/glib/pkg.yaml b/guest-agents/qemu-guest-agent/glib/pkg.yaml index bbd8dc2..42b901c 100644 --- a/guest-agents/qemu-guest-agent/glib/pkg.yaml +++ b/guest-agents/qemu-guest-agent/glib/pkg.yaml @@ -1,6 +1,6 @@ name: glib variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" @@ -11,17 +11,15 @@ steps: destination: glib.tar.xz sha256: 8428d672c8485636d940f03ce8dcdc174f9b3892ac8b2eea76dd281af6a6e937 sha512: 1686ef719122d2b3e8bcc569ba1e125cde51fbe645811e1eb7ddd49e300ff834eed712bb619bba13629f23ad5f801fdc2d37e3103b5150ad3cb7ff9d1168d902 + - network: default prepare: - | tar -xf glib.tar.xz --strip-components=1 rm glib.tar.xz - | mkdir -p /usr/bin - - ln -s /toolchain/bin/env /usr/bin/env - ln -s /toolchain/bin/python3 /toolchain/bin/python - pip3 install ninja packaging + - network: none build: - | export PKG_CONFIG_PATH=/usr/lib/pkgconfig diff --git a/guest-agents/qemu-guest-agent/pcre2/pkg.yaml b/guest-agents/qemu-guest-agent/pcre2/pkg.yaml index f5e1ef3..214c7d0 100644 --- a/guest-agents/qemu-guest-agent/pcre2/pkg.yaml +++ b/guest-agents/qemu-guest-agent/pcre2/pkg.yaml @@ -1,6 +1,6 @@ name: pcre2 variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: diff --git a/guest-agents/qemu-guest-agent/pkg.yaml b/guest-agents/qemu-guest-agent/pkg.yaml index 52b774a..d8f1cd3 100644 --- a/guest-agents/qemu-guest-agent/pkg.yaml +++ b/guest-agents/qemu-guest-agent/pkg.yaml @@ -1,6 +1,6 @@ name: qemu-guest-agent variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" @@ -12,6 +12,7 @@ steps: destination: qemu.tar.xz sha256: f859f0bc65e1f533d040bbe8c92bcfecee5af2c921a6687c652fb44d089bd894 sha512: f92548623e4e31400c823a2d78417a8a4ecfccb07f3ee4883e2f2ad33054539d2a37d076dbc64df42c6c86c08fa7c2c975cd6e823aa14d5f20cef83348006813 + - network: default prepare: - | sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml @@ -21,9 +22,6 @@ steps: - | mkdir -p /usr/bin - ln -s /toolchain/bin/env /usr/bin/env - ln -s /toolchain/bin/python3 /toolchain/bin/python - pip3 install ninja extra_args=( ) @@ -47,6 +45,7 @@ steps: --enable-guest-agent \ --enable-stack-protector \ "${extra_args[@]}" + - network: none build: - | make -j $(nproc) qemu-ga diff --git a/guest-agents/vars.yaml b/guest-agents/vars.yaml index c5df644..f9369bd 100644 --- a/guest-agents/vars.yaml +++ b/guest-agents/vars.yaml @@ -5,7 +5,7 @@ GLIB_VERSION: 2.83.2 # renovate: datasource=github-releases extractVersion=^pcre2-(?.*)$ depName=PCRE2Project/pcre2 PCRE2_VERSION: 10.42 # renovate: datasource=git-tags depName=https://gitlab.com/xen-project/xen-guest-agent.git -XEN_GUEST_AGENT_VERSION: 0.4.0 +XEN_GUEST_AGENT_VERSION: 5c274e651c29f92fc0c418fda486373b0f34f0da # renovate: datasource=github-releases depName=siderolabs/talos-vmtoolsd TALOS_VMTOOLSD_VERSION: v0.6.1 # renovate: datasource=github-releases depName=siderolabs/talos-metal-agent diff --git a/guest-agents/vmtoolsd-guest-agent/pkg.yaml b/guest-agents/vmtoolsd-guest-agent/pkg.yaml index ea7df5d..42b0788 100644 --- a/guest-agents/vmtoolsd-guest-agent/pkg.yaml +++ b/guest-agents/vmtoolsd-guest-agent/pkg.yaml @@ -1,5 +1,6 @@ name: vmtoolsd-guest-agent variant: scratch +shell: /bin/bash dependencies: - stage: base - image: {{ .BUILD_ARG_PKGS_PREFIX }}/talos-vmtoolsd:{{ .TALOS_VMTOOLSD_VERSION }} diff --git a/guest-agents/xen-guest-agent/pkg.yaml b/guest-agents/xen-guest-agent/pkg.yaml index 5f6bc04..b7363f8 100644 --- a/guest-agents/xen-guest-agent/pkg.yaml +++ b/guest-agents/xen-guest-agent/pkg.yaml @@ -17,14 +17,18 @@ steps: RUSTFLAGS: '-C target-feature=+crt-static' - sources: - url: https://gitlab.com/xen-project/xen-guest-agent/-/archive/{{ .XEN_GUEST_AGENT_VERSION }}/xen-guest-agent-{{ .XEN_GUEST_AGENT_VERSION }}.tar.gz - sha256: 492ba2022b4155b38443ddf34a5bdbb0d72966d0936aab8545b4a135fa69c990 - sha512: 527611f1d0c4fec81ac44434304f426bb9ebe75ceeaac84a417397ec845da6a225514d6ff8b9dc03b5c27d4fa3b59a47fd1a64276fbf6b492664244796ef483c + sha256: c52f4781739e500e98a3298c9e44fe9bcbe1892c22aa6bb031d1a847123deaaa + sha512: 49bf15d7257f7fcb5ac919ca57e8c16bb6f8199684adef034bd1e7683dd9fb23a5604667fb75e27eadd02a2f9b130339409873b5720d7d3f5e4153feb5fa98ba destination: xe-guest-agent.tar.gz + - network: default prepare: - | sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | tar -xzvf xe-guest-agent.tar.gz --strip-components=1 + - | + cargo fetch --target {{ .ARCH }}-alpine-linux-musl + - network: none build: - cargo build --release -F static --target {{ .ARCH }}-alpine-linux-musl install: diff --git a/guest-agents/xen-guest-agent/vars.yaml b/guest-agents/xen-guest-agent/vars.yaml index b9377b5..27c7d88 100644 --- a/guest-agents/xen-guest-agent/vars.yaml +++ b/guest-agents/xen-guest-agent/vars.yaml @@ -1 +1,3 @@ -VERSION: "{{ .XEN_GUEST_AGENT_VERSION }}" +# VERSION: "{{ .XEN_GUEST_AGENT_VERSION }}" +# FIXME: Replace once a building tag is available +VERSION: "0.4.0-g5c274e6" diff --git a/internal/base/pkg.yaml b/internal/base/pkg.yaml index 63e93eb..6c6e22d 100644 --- a/internal/base/pkg.yaml +++ b/internal/base/pkg.yaml @@ -1,10 +1,10 @@ name: base variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/base:{{ .BUILD_ARG_PKGS }}" - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/ca-certificates:{{ .BUILD_ARG_PKGS }}" - - image: ghcr.io/siderolabs/extensions-validator:617ea3f + - image: ghcr.io/siderolabs/extensions-validator:7d4395d finalize: - from: / to: / diff --git a/misc/binfmt-misc/pkg.yaml b/misc/binfmt-misc/pkg.yaml index 6805f26..df74304 100644 --- a/misc/binfmt-misc/pkg.yaml +++ b/misc/binfmt-misc/pkg.yaml @@ -1,6 +1,6 @@ name: binfmt-misc variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,16 +12,16 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - export KERNELRELEASE=$(find /lib/modules -type d -name "*-talos" -exec basename {} \+) + export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) mkdir -p /rootfs - xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} - depmod -b /rootfs ${KERNELRELEASE} + xargs -a /pkg/files/modules.txt -I {} install -D /usr/lib/modules/${KERNELRELEASE}/{} /rootfs/usr/lib/modules/${KERNELRELEASE}/{} + depmod -b /rootfs/usr ${KERNELRELEASE} - test: - | # https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping - find /rootfs/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ + find /rootfs/usr/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ - | mkdir -p /extensions-validator-rootfs cp -r /rootfs/ /extensions-validator-rootfs/rootfs diff --git a/misc/glibc/pkg.yaml b/misc/glibc/pkg.yaml index 65722d2..df8b6c8 100644 --- a/misc/glibc/pkg.yaml +++ b/misc/glibc/pkg.yaml @@ -52,9 +52,9 @@ steps: cp /pkg/ld.so.conf /rootfs/usr/local/glibc/etc/ld.so.conf - mkdir -p /rootfs/lib64 /rootfs/sbin - ln -s /usr/local/glibc/usr/lib/ld-linux-x86-64.so.2 /rootfs/lib64/ld-linux-x86-64.so.2 - ln -s /usr/local/glibc/usr/sbin/ldconfig /rootfs/sbin/ldconfig + mkdir -p /rootfs/usr/lib /rootfs/usr/bin + ln -s /usr/local/glibc/usr/lib/ld-linux-x86-64.so.2 /rootfs/usr/lib/ld-linux-x86-64.so.2 + ln -s /usr/local/glibc/usr/sbin/ldconfig /rootfs/usr/bin/ldconfig # cleanup rm -rf /rootfs/usr/local/glibc/include diff --git a/network/lldpd/pkg.yaml b/network/lldpd/pkg.yaml index 2dbe505..7275ffd 100644 --- a/network/lldpd/pkg.yaml +++ b/network/lldpd/pkg.yaml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MPL-2.0 name: lldpd variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: @@ -29,8 +29,6 @@ steps: mkdir -p /usr/local/include/sys cp sys-queue.h /usr/local/include/sys/queue.h - | - ln -sf /toolchain/bin/env /usr/bin/env - export CFLAGS="${CFLAGS} -I/usr/local/include" ./configure \ diff --git a/network/tailscale/pkg.yaml b/network/tailscale/pkg.yaml index 49669f4..3450fc6 100644 --- a/network/tailscale/pkg.yaml +++ b/network/tailscale/pkg.yaml @@ -1,30 +1,32 @@ name: tailscale variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: - env: - GOPATH: /go + GOPATH: /tmp/go - cachePaths: - /.cache/go-build - - /go/pkg + - /tmp/go/pkg sources: - url: https://github.com/tailscale/tailscale/archive/refs/tags/v{{ .TAILSCALE_VERSION }}.tar.gz destination: tailscale.tar.gz sha256: dbc25cc241bb233f183475f003d5508af7b45add1ca548b35a6a6fea91fb91af sha512: 1286971554f15c601ee36050cbe361170de2ea4955fc8dde01a4a231f966a1049b9d85d2854637077c1900d4e67ef15352250e412f9e13b2d1cb6b34b2dce05a + - network: default prepare: - | sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - - | mkdir tailscale dist tar -xzvf tailscale.tar.gz --strip-components=1 -C tailscale + - | + cd tailscale + go mod download + - network: none build: - | - export PATH=${PATH}:${TOOLCHAIN}/go/bin - go build \ -C tailscale \ -o ../dist \ diff --git a/nvidia-gpu/nonfree/kmod-nvidia/lts/pkg.yaml b/nvidia-gpu/nonfree/kmod-nvidia/lts/pkg.yaml index 9b96f0f..27f67c3 100644 --- a/nvidia-gpu/nonfree/kmod-nvidia/lts/pkg.yaml +++ b/nvidia-gpu/nonfree/kmod-nvidia/lts/pkg.yaml @@ -1,6 +1,6 @@ name: nonfree-kmod-nvidia-lts variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,12 +12,12 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - mkdir -p /rootfs/lib/modules \ + mkdir -p /rootfs/usr/lib/modules \ /rootfs/usr/local/lib/modprobe.d cp /pkg/files/nvidia.conf /rootfs/usr/local/lib/modprobe.d/nvidia.conf - cp -R /lib/modules/* /rootfs/lib/modules + cp -R /usr/lib/modules/* /rootfs/usr/lib/modules test: - | mkdir -p /extensions-validator-rootfs diff --git a/nvidia-gpu/nonfree/kmod-nvidia/production/pkg.yaml b/nvidia-gpu/nonfree/kmod-nvidia/production/pkg.yaml index 24f95ba..5267d2e 100644 --- a/nvidia-gpu/nonfree/kmod-nvidia/production/pkg.yaml +++ b/nvidia-gpu/nonfree/kmod-nvidia/production/pkg.yaml @@ -1,6 +1,6 @@ name: nonfree-kmod-nvidia-production variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,12 +12,12 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - mkdir -p /rootfs/lib/modules \ + mkdir -p /rootfs/usr/lib/modules \ /rootfs/usr/local/lib/modprobe.d cp /pkg/files/nvidia.conf /rootfs/usr/local/lib/modprobe.d/nvidia.conf - cp -R /lib/modules/* /rootfs/lib/modules + cp -R /usr/lib/modules/* /rootfs/usr/lib/modules test: - | mkdir -p /extensions-validator-rootfs diff --git a/nvidia-gpu/nvidia-container-toolkit/lts/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/lts/pkg.yaml index 4215aa5..0cbf921 100644 --- a/nvidia-gpu/nvidia-container-toolkit/lts/pkg.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/lts/pkg.yaml @@ -1,6 +1,6 @@ name: nvidia-container-toolkit-lts variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - stage: nvidia-container-cli-lts @@ -19,7 +19,6 @@ steps: install: - | mkdir -p /rootfs/usr/local/etc/containers - cp /pkg/nvidia-persistenced.yaml /rootfs/usr/local/etc/containers/nvidia-persistenced.yaml test: - | diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/lts/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/lts/pkg.yaml index ea023ed..6b745a3 100644 --- a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/lts/pkg.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/lts/pkg.yaml @@ -46,12 +46,15 @@ steps: - | mkdir libnvidia-container tar -xzf libnvidia-container.tar.gz --strip-components=1 -C libnvidia-container + # FIXME: make downloads nvidia-modprobe + - network: default build: - | cd libnvidia-container # LDLIBS=-L/usr/local/glibc/lib is set so that libnvidia-container-cli libs which are hardcoded as -llibname and not using pkg-config CPPFLAGS="-I/usr/local/glibc/include/tirpc" LDLIBS="-L/usr/local/glibc/lib -ltirpc -lelf -lseccomp" LDFLAGS='-Wl,--rpath=\$$ORIGIN/../glibc/\$$LIB' make + - network: none install: - | mkdir -p /rootfs diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/production/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/production/pkg.yaml index 516d791..fd5afb3 100644 --- a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/production/pkg.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/production/pkg.yaml @@ -46,12 +46,15 @@ steps: - | mkdir libnvidia-container tar -xzf libnvidia-container.tar.gz --strip-components=1 -C libnvidia-container + # FIXME: make downloads nvidia-modprobe + - network: default build: - | cd libnvidia-container # LDLIBS=-L/usr/local/glibc/lib is set so that libnvidia-container-cli libs which are hardcoded as -llibname and not using pkg-config CPPFLAGS="-I/usr/local/glibc/include/tirpc" LDLIBS="-L/usr/local/glibc/lib -ltirpc -lelf -lseccomp" LDFLAGS='-Wl,--rpath=\$$ORIGIN/../glibc/\$$LIB' make + - network: none install: - | mkdir -p /rootfs diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime-wrapper/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime-wrapper/pkg.yaml index 0eed9f7..8156825 100644 --- a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime-wrapper/pkg.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime-wrapper/pkg.yaml @@ -1,18 +1,23 @@ name: nvidia-container-runtime-wrapper variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: + - env: + GOPATH: /tmp/go - cachePaths: - /.cache/go-build - - /go/pkg + - /tmp/go/pkg + - network: default + prepare: + - | + cp -r /pkg/* . + - | + go mod download + - network: none build: - | - export PATH=${PATH}:${TOOLCHAIN}/go/bin - - cp -r /pkg/* . - CGO_ENABLED=0 go build -o nvidia-container-runtime-wrapper main.go install: - | diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-persistenced-wrapper/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-persistenced-wrapper/pkg.yaml index dde8134..7e41f7e 100644 --- a/nvidia-gpu/nvidia-container-toolkit/nvidia-persistenced-wrapper/pkg.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/nvidia-persistenced-wrapper/pkg.yaml @@ -1,18 +1,23 @@ name: nvidia-persistenced-wrapper variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: + - env: + GOPATH: /tmp/go - cachePaths: - /.cache/go-build - - /go/pkg + - /tmp/go/pkg + - network: default + prepare: + - | + cp -r /pkg/* . + - | + go mod download + - network: none build: - | - export PATH=${PATH}:${TOOLCHAIN}/go/bin - - cp -r /pkg/* . - CGO_ENABLED=0 go build -o nvidia-persistenced-wrapper main.go install: - | diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/lts/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/lts/pkg.yaml index d702b0f..dbbe0b4 100644 --- a/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/lts/pkg.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/lts/pkg.yaml @@ -66,7 +66,7 @@ steps: --no-kernel-module-source \ --no-check-for-alternate-installs \ --override-file-type-destination=NVIDIA_MODPROBE:/rootfs/usr/local/bin \ - --override-file-type-destination=FIRMWARE:/rootfs/lib/firmware/nvidia/{{ .NVIDIA_DRIVER_LTS_VERSION }} \ + --override-file-type-destination=FIRMWARE:/rootfs/usr/lib/firmware/nvidia/{{ .NVIDIA_DRIVER_LTS_VERSION }} \ --no-systemd \ # {{ if eq .ARCH "x86_64" }}--no-install-compat32-libs{{ end }} diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/production/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/production/pkg.yaml index c9fa353..7da7407 100644 --- a/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/production/pkg.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/production/pkg.yaml @@ -65,7 +65,7 @@ steps: --no-kernel-module-source \ --no-check-for-alternate-installs \ --override-file-type-destination=NVIDIA_MODPROBE:/rootfs/usr/local/bin \ - --override-file-type-destination=FIRMWARE:/rootfs/lib/firmware/nvidia/{{ .NVIDIA_DRIVER_PRODUCTION_VERSION }} \ + --override-file-type-destination=FIRMWARE:/rootfs/usr/lib/firmware/nvidia/{{ .NVIDIA_DRIVER_PRODUCTION_VERSION }} \ --no-systemd # copy vulkan/OpenGL json files diff --git a/nvidia-gpu/nvidia-container-toolkit/production/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/production/pkg.yaml index 022f4d1..41dbcb5 100644 --- a/nvidia-gpu/nvidia-container-toolkit/production/pkg.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/production/pkg.yaml @@ -1,6 +1,6 @@ name: nvidia-container-toolkit-production variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - stage: nvidia-container-cli-production diff --git a/nvidia-gpu/nvidia-fabricmanager/lts/pkg.yaml b/nvidia-gpu/nvidia-fabricmanager/lts/pkg.yaml index f9f3156..1c82caa 100644 --- a/nvidia-gpu/nvidia-fabricmanager/lts/pkg.yaml +++ b/nvidia-gpu/nvidia-fabricmanager/lts/pkg.yaml @@ -1,6 +1,6 @@ name: nvidia-fabricmanager-lts variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: diff --git a/nvidia-gpu/nvidia-fabricmanager/production/pkg.yaml b/nvidia-gpu/nvidia-fabricmanager/production/pkg.yaml index eaa8656..4fd5923 100644 --- a/nvidia-gpu/nvidia-fabricmanager/production/pkg.yaml +++ b/nvidia-gpu/nvidia-fabricmanager/production/pkg.yaml @@ -1,6 +1,6 @@ name: nvidia-fabricmanager-production variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: diff --git a/nvidia-gpu/nvidia-modules/lts/pkg.yaml b/nvidia-gpu/nvidia-modules/lts/pkg.yaml index 6c29c2b..52da1fb 100644 --- a/nvidia-gpu/nvidia-modules/lts/pkg.yaml +++ b/nvidia-gpu/nvidia-modules/lts/pkg.yaml @@ -1,6 +1,6 @@ name: nvidia-open-gpu-kernel-modules-lts variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,12 +12,12 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - mkdir -p /rootfs/lib/modules \ + mkdir -p /rootfs/usr/lib/modules \ /rootfs/usr/local/lib/modprobe.d cp /pkg/files/nvidia.conf /rootfs/usr/local/lib/modprobe.d/nvidia.conf - cp -R /lib/modules/* /rootfs/lib/modules + cp -R /usr/lib/modules/* /rootfs/usr/lib/modules test: - | mkdir -p /extensions-validator-rootfs diff --git a/nvidia-gpu/nvidia-modules/production/pkg.yaml b/nvidia-gpu/nvidia-modules/production/pkg.yaml index 64c374d..9b46f3e 100644 --- a/nvidia-gpu/nvidia-modules/production/pkg.yaml +++ b/nvidia-gpu/nvidia-modules/production/pkg.yaml @@ -1,6 +1,6 @@ name: nvidia-open-gpu-kernel-modules-production variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,12 +12,12 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - mkdir -p /rootfs/lib/modules \ + mkdir -p /rootfs/usr/lib/modules \ /rootfs/usr/local/lib/modprobe.d cp /pkg/files/nvidia.conf /rootfs/usr/local/lib/modprobe.d/nvidia.conf - cp -R /lib/modules/* /rootfs/lib/modules + cp -R /usr/lib/modules/* /rootfs/usr/lib/modules test: - | mkdir -p /extensions-validator-rootfs diff --git a/power/nut-client/pkg.yaml b/power/nut-client/pkg.yaml index 29a67ee..c8f73d4 100644 --- a/power/nut-client/pkg.yaml +++ b/power/nut-client/pkg.yaml @@ -1,6 +1,6 @@ name: nut-client variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" @@ -21,12 +21,6 @@ steps: patch -p1 < /pkg/patches/replace_system.patch - | mkdir -p /usr/bin - ln -sf /toolchain/bin/env /usr/bin/env - - # Create symlinks for files used when building. - ln -s /toolchain/bin/pkg-config /usr/bin/pkg-config - ln -s /toolchain/bin/file /usr/bin/file - autoreconf -if export PKG_CONFIG_PATH=/usr/lib/pkgconfig diff --git a/storage/btrfs/pkg.yaml b/storage/btrfs/pkg.yaml index 202b6fa..dd82e8d 100644 --- a/storage/btrfs/pkg.yaml +++ b/storage/btrfs/pkg.yaml @@ -1,6 +1,6 @@ name: btrfs variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,16 +12,16 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - export KERNELRELEASE=$(find /lib/modules -type d -name "*-talos" -exec basename {} \+) + export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) mkdir -p /rootfs - xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} - depmod -b /rootfs ${KERNELRELEASE} + xargs -a /pkg/files/modules.txt -I {} install -D /usr/lib/modules/${KERNELRELEASE}/{} /rootfs/usr/lib/modules/${KERNELRELEASE}/{} + depmod -b /rootfs/usr ${KERNELRELEASE} - test: - | # https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping - find /rootfs/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ + find /rootfs/usr/lib/modules -name '*.ko' -exec grep -FL '~Module signature appended~' {} \+ - | mkdir -p /extensions-validator-rootfs cp -r /rootfs/ /extensions-validator-rootfs/rootfs diff --git a/storage/drbd/pkg.yaml b/storage/drbd/pkg.yaml index bd3153a..da4bda2 100644 --- a/storage/drbd/pkg.yaml +++ b/storage/drbd/pkg.yaml @@ -1,6 +1,6 @@ name: drbd variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -12,9 +12,9 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - mkdir -p /rootfs/lib/modules + mkdir -p /rootfs/usr/lib/modules - cp -R /lib/modules/* /rootfs/lib/modules + cp -R /usr/lib/modules/* /rootfs/usr/lib/modules test: - | mkdir -p /extensions-validator-rootfs diff --git a/storage/fuse3/pkg.yaml b/storage/fuse3/pkg.yaml index 47ddaac..e34f198 100644 --- a/storage/fuse3/pkg.yaml +++ b/storage/fuse3/pkg.yaml @@ -1,6 +1,6 @@ name: fuse3 variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" @@ -10,6 +10,7 @@ steps: destination: fuse.tar.gz sha256: f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87 sha512: 3e8889863cd67dada67271f095f694dc9e5aaf2561fd1e2285aee95b5a54e692bb195ab8fce57fc2bdf08d0ea17b6d56ca4967b4e4371d639d6133907b2370d3 + - network: default prepare: - | sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml @@ -17,8 +18,6 @@ steps: tar -xzf fuse.tar.gz --strip-components=1 mkdir -p /usr/bin - ln -s /toolchain/bin/env /usr/bin/env - ln -s /toolchain/bin/python3 /toolchain/bin/python pip3 install ninja mkdir -p /rootfs/usr/local/etc @@ -28,6 +27,7 @@ steps: mkdir _build meson setup _build meson configure -D useroot=false -D initscriptdir='' _build + - network: none build: - | ninja -C _build diff --git a/storage/iscsi-tools/open-iscsi/pkg.yaml b/storage/iscsi-tools/open-iscsi/pkg.yaml index ee3aaed..6da305e 100644 --- a/storage/iscsi-tools/open-iscsi/pkg.yaml +++ b/storage/iscsi-tools/open-iscsi/pkg.yaml @@ -1,6 +1,6 @@ name: open-iscsi variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kmod:{{ .BUILD_ARG_PKGS }}" @@ -14,22 +14,11 @@ steps: sha512: 18b92d3e9a85d8de66734d95e9ca74a8acc5167a98830134c18ad5e226b29a00d358f952edfab67b643c454ec63c0a382c7ab7e7e76970f7574b46cea0d5c82d env: SOURCE_DATE_EPOCH: {{ .BUILD_ARG_SOURCE_DATE_EPOCH }} + - network: default prepare: - | - mkdir -p /usr/bin \ - && ln -sf /toolchain/bin/env /usr/bin/env \ - && ln -sf /toolchain/bin/install /usr/bin/install \ - && ln -s /toolchain/bin/python3 /toolchain/bin/python - tar -xzf open-iscsi.tar.gz --strip-components=1 - # Create symlinks for binaries required by libtoolize. - ln -s /toolchain/bin/sed /usr/bin/sed - - # Create symlinks for files used when building. - ln -s /toolchain/bin/pkg-config /usr/bin/pkg-config - ln -s /toolchain/bin/file /usr/bin/file - patch -p1 < /pkg/patches/login-scan-manual.patch patch -p1 < /pkg/patches/musl-fixes.patch patch -p1 < /pkg/patches/add-missing-headers.patch @@ -37,6 +26,7 @@ steps: patch -p1 < /pkg/patches/remove-werror.patch pip3 install ninja + - network: none build: - | export PKG_CONFIG_PATH=/usr/lib/pkgconfig diff --git a/storage/iscsi-tools/pkg.yaml b/storage/iscsi-tools/pkg.yaml index 7afec1a..7b08e41 100644 --- a/storage/iscsi-tools/pkg.yaml +++ b/storage/iscsi-tools/pkg.yaml @@ -1,6 +1,6 @@ name: iscsi-tools variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: # `base` dependency is used for doing cleanups # not copied to rootfs diff --git a/storage/mdadm/pkg.yaml b/storage/mdadm/pkg.yaml index 78328d9..1db82d6 100644 --- a/storage/mdadm/pkg.yaml +++ b/storage/mdadm/pkg.yaml @@ -1,6 +1,6 @@ name: mdadm variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/systemd-udevd:{{ .BUILD_ARG_PKGS }}" diff --git a/storage/zfs/pkg.yaml b/storage/zfs/pkg.yaml index 0fe6e2b..94db9d7 100644 --- a/storage/zfs/pkg.yaml +++ b/storage/zfs/pkg.yaml @@ -1,6 +1,6 @@ name: zfs variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in @@ -16,8 +16,8 @@ steps: sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | - mkdir -p /rootfs/lib/modules - cp -R /lib/modules/* /rootfs/lib/modules/ + mkdir -p /rootfs/usr/lib/modules + cp -R /usr/lib/modules/* /rootfs/usr/lib/modules/ - | mkdir -p /rootfs/usr/local/etc/containers cp /pkg/zfs-service.yaml /rootfs/usr/local/etc/containers/ diff --git a/storage/zfs/zfs-service/pkg.yaml b/storage/zfs/zfs-service/pkg.yaml index 374927d..5c81c4f 100644 --- a/storage/zfs/zfs-service/pkg.yaml +++ b/storage/zfs/zfs-service/pkg.yaml @@ -1,16 +1,23 @@ name: zfs-service variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: + - env: + GOPATH: /tmp/go - cachePaths: - /.cache/go-build - - /go/pkg + - /tmp/go/pkg + - network: default + prepare: + - | + cp -r /pkg/* . + - | + go mod download + - network: none build: - | - export PATH=${PATH}:${TOOLCHAIN}/go/bin - cp -r /pkg/* . CGO_ENABLED=0 go build -ldflags "-s -w" -trimpath -o zfs-service main.go install: - | diff --git a/storage/zfs/zfs-tools/libtirpc/pkg.yaml b/storage/zfs/zfs-tools/libtirpc/pkg.yaml index df35764..be26a60 100644 --- a/storage/zfs/zfs-tools/libtirpc/pkg.yaml +++ b/storage/zfs/zfs-tools/libtirpc/pkg.yaml @@ -1,7 +1,7 @@ name: libtirpc-zfs variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: diff --git a/storage/zfs/zfs-tools/pkg.yaml b/storage/zfs/zfs-tools/pkg.yaml index ff8f261..3e22919 100644 --- a/storage/zfs/zfs-tools/pkg.yaml +++ b/storage/zfs/zfs-tools/pkg.yaml @@ -1,6 +1,6 @@ name: zfs-tools variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - stage: libtirpc-zfs diff --git a/storage/zfs/zfs-tools/zlib/pkg.yaml b/storage/zfs/zfs-tools/zlib/pkg.yaml index dcfbd7d..b3e7551 100644 --- a/storage/zfs/zfs-tools/zlib/pkg.yaml +++ b/storage/zfs/zfs-tools/zlib/pkg.yaml @@ -1,6 +1,6 @@ name: zlib-zfs variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: diff --git a/tools/nvme-cli/libnvme/pkg.yaml b/tools/nvme-cli/libnvme/pkg.yaml index 4b1e2d5..58a5d56 100644 --- a/tools/nvme-cli/libnvme/pkg.yaml +++ b/tools/nvme-cli/libnvme/pkg.yaml @@ -1,6 +1,6 @@ name: libnvme variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" @@ -11,13 +11,12 @@ steps: destination: libnvme.tar.gz sha256: 6d5d8ba2cc4c94a61a994c9f7f25b3b26ef973fb5c0daa37729890903f37a1f1 sha512: 8720f2907a3d13af44fb3deec883cd6eb247d5861c4459b5fe0e67ff9ecfb565462a5faf39d43e08b5284f3e8ca8e72d41b333984beaa45d3287b1a258f3e59d + - network: default prepare: - | tar xf libnvme.tar.gz --strip-components=1 mkdir -p /usr/bin - ln -s /toolchain/bin/env /usr/bin/env - ln -s /toolchain/bin/python3 /toolchain/bin/python pip3 install ninja export PKG_CONFIG_PATH=/usr/lib/pkgconfig @@ -27,6 +26,7 @@ steps: -Djson-c=enabled \ -Dpython=disabled \ .build + - network: none build: - | meson compile -C .build diff --git a/tools/nvme-cli/pkg.yaml b/tools/nvme-cli/pkg.yaml index d6b14ce..7233bbb 100644 --- a/tools/nvme-cli/pkg.yaml +++ b/tools/nvme-cli/pkg.yaml @@ -1,6 +1,6 @@ name: nvme-cli variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" @@ -16,6 +16,7 @@ steps: destination: nvme-cli.tar.gz sha256: 5e4dc73dbb488c6b1e6ad1c78d0c62b624076fcb0c052bd9039674a1dbd6517b sha512: 33de20ad990a3b87fef46fa486832edde41907223aa6b8a47606e605b360745fd7e2054226bf93a59b2a09c6bc04d0b684e4b3bb27c3fc0e6110c64a558cadc0 + - network: default prepare: - | tar xf nvme-cli.tar.gz --strip-components=1 @@ -23,8 +24,6 @@ steps: export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig mkdir -p /usr/bin - ln -s /toolchain/bin/env /usr/bin/env - ln -s /toolchain/bin/python3 /toolchain/bin/python pip3 install ninja export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig @@ -39,6 +38,7 @@ steps: .build - | sed -i 's#$VERSION#{{ .NVME_CLI_VERSION }}#' /pkg/manifest.yaml + - network: none build: - | meson compile -C .build diff --git a/tools/util-linux/pkg.yaml b/tools/util-linux/pkg.yaml index 62952ae..d81cd6c 100644 --- a/tools/util-linux/pkg.yaml +++ b/tools/util-linux/pkg.yaml @@ -1,6 +1,6 @@ name: util-linux-tools variant: scratch -shell: /toolchain/bin/bash +shell: /bin/bash dependencies: - stage: base steps: