-
Notifications
You must be signed in to change notification settings - Fork 123
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: combine i915/amdgpu firmware+drivers
Combine the i915/amdgpu firmware and drivers and package them together. Fixes: siderolabs/talos#9728 Signed-off-by: Noel Georgi <[email protected]>
- Loading branch information
Showing
16 changed files
with
118 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| modules.order | ||
| modules.builtin | ||
| modules.builtin.modinfo | ||
| kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko | ||
| kernel/drivers/gpu/drm/amd/amdxcp/amdxcp.ko |
4 changes: 2 additions & 2 deletions
4
firmware/amdgpu-firmware/manifest.yaml → drm/amdgpu/manifest.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| version: v1alpha1 | ||
| metadata: | ||
| name: amdgpu-firmware | ||
| name: amdgpu | ||
| version: "$VERSION" | ||
| author: Sidero Labs | ||
| description: | | ||
| This system extension provides AMDGPU firmware binaries. | ||
| This system extension provides AMDGPU firmware binaries and kernel modules. | ||
| compatibility: | ||
| talos: | ||
| version: ">= v1.0.0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| name: amdgpu | ||
| variant: scratch | ||
| shell: /toolchain/bin/bash | ||
| dependencies: | ||
| - stage: base | ||
| # The pkgs version for a particular release of Talos as defined in | ||
| # https://github.com/siderolabs/talos/blob/<talos version>/pkg/machinery/gendata/data/pkgs | ||
| - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" | ||
| - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" | ||
| steps: | ||
| - prepare: | ||
| - | | ||
| sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml | ||
| mkdir -p /rootfs | ||
| # {{ 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 {} \+) | ||
| xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} | ||
| - | | ||
| mkdir -p /rootfs/lib/firmware | ||
| cp -R -p /lib/firmware/amdgpu /rootfs/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~' {} \+ | ||
| - | | ||
| 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}" | ||
| # {{ end }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr | ||
| finalize: | ||
| - from: /rootfs | ||
| to: /rootfs | ||
| - from: /pkg/manifest.yaml | ||
| to: / |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| VERSION: "{{ .LINUX_FIRMWARE_VERSION }}-{{ .BUILD_ARG_TAG }}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| modules.order | ||
| modules.builtin | ||
| modules.builtin.modinfo | ||
| kernel/drivers/gpu/drm/i915/i915.ko |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| version: v1alpha1 | ||
| metadata: | ||
| name: i915-ucode | ||
| name: i915 | ||
| version: "$VERSION" | ||
| author: Sidero Labs | ||
| description: | | ||
| This system extension provides Intel GPU microcode binaries. | ||
| This system extension provides Intel GPU microcode binaries and kernel modules. | ||
| compatibility: | ||
| talos: | ||
| version: ">= v1.0.0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| name: i915 | ||
| variant: scratch | ||
| shell: /toolchain/bin/bash | ||
| dependencies: | ||
| - stage: base | ||
| # The pkgs version for a particular release of Talos as defined in | ||
| # https://github.com/siderolabs/talos/blob/<talos version>/pkg/machinery/gendata/data/pkgs | ||
| - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" | ||
| - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" | ||
| steps: | ||
| - prepare: | ||
| - | | ||
| sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml | ||
| mkdir -p /rootfs | ||
| # {{ 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 {} \+) | ||
| xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} | ||
| - | | ||
| mkdir -p /rootfs/lib/firmware | ||
| cp -R -p /lib/firmware/i915 /rootfs/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~' {} \+ | ||
| - | | ||
| 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}" | ||
| # {{ end }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr | ||
| finalize: | ||
| - from: /rootfs | ||
| to: /rootfs | ||
| - from: /pkg/manifest.yaml | ||
| to: / |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| VERSION: "{{ .LINUX_FIRMWARE_VERSION }}-{{ .BUILD_ARG_TAG }}" |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters