From 7ba3b3a8b5c755aa3936804dc6d04d5173f5a115 Mon Sep 17 00:00:00 2001 From: Nathan Lee Date: Tue, 5 Dec 2023 14:41:17 -0600 Subject: [PATCH] feat: extension providing QLogic firmware Add extension for QLogic firmware. Pulled from #278. Signed-off-by: Nathan Lee Signed-off-by: Noel Georgi --- .github/workflows/ci.yaml | 9 +++++---- .github/workflows/weekly.yaml | 4 ++-- .kres.yaml | 1 + Makefile | 2 +- README.md | 1 + firmware/qlogic-firmware/manifest.yaml | 10 ++++++++++ firmware/qlogic-firmware/pkg.yaml | 19 +++++++++++++++++++ firmware/qlogic-firmware/vars.yaml | 1 + 8 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 firmware/qlogic-firmware/manifest.yaml create mode 100644 firmware/qlogic-firmware/pkg.yaml create mode 100644 firmware/qlogic-firmware/vars.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d274702c..952c6433 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2023-11-22T14:00:12Z by kres latest. +# Generated on 2023-12-12T23:07:05Z by kres latest. name: default concurrency: @@ -33,7 +33,7 @@ jobs: labels: ${{ steps.retrieve-pr-labels.outputs.result }} services: buildkitd: - image: moby/buildkit:v0.12.3 + image: moby/buildkit:v0.12.4 options: --privileged ports: - 1234:1234 @@ -77,11 +77,12 @@ jobs: make nonfree PUSH=true - name: Retrieve PR labels id: retrieve-pr-labels - if: github.event_name == 'pull_request' && always() uses: actions/github-script@v6 with: retries: "3" script: | + if (context.eventName != "pull_request") { return "[]" } + const resp = await github.rest.issues.get({ issue_number: context.issue.number, owner: context.repo.owner, @@ -114,7 +115,7 @@ jobs: - default services: buildkitd: - image: moby/buildkit:v0.12.3 + image: moby/buildkit:v0.12.4 options: --privileged ports: - 1234:1234 diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml index 1f9fe3cd..1666206c 100644 --- a/.github/workflows/weekly.yaml +++ b/.github/workflows/weekly.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2023-11-13T17:09:48Z by kres latest. +# Generated on 2023-12-12T23:07:05Z by kres latest. name: weekly concurrency: @@ -16,7 +16,7 @@ jobs: - pkgs services: buildkitd: - image: moby/buildkit:v0.12.3 + image: moby/buildkit:v0.12.4 options: --privileged ports: - 1234:1234 diff --git a/.kres.yaml b/.kres.yaml index 64c33e45..ec2ed189 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -25,6 +25,7 @@ spec: - nvidia-fabricmanager - nvidia-open-gpu-kernel-modules - qemu-guest-agent + - qlogic-firmware - stargz-snapshotter - tailscale - thunderbolt diff --git a/Makefile b/Makefile index 421c36e2..3be875ce 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2023-12-07T13:02:30Z by kres latest. # common variables @@ -72,6 +71,7 @@ TARGETS += nvidia-container-toolkit TARGETS += nvidia-fabricmanager TARGETS += nvidia-open-gpu-kernel-modules TARGETS += qemu-guest-agent +TARGETS += qlogic-firmware TARGETS += stargz-snapshotter TARGETS += tailscale TARGETS += thunderbolt diff --git a/README.md b/README.md index 9be77a7d..b125d3b9 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,7 @@ cosign verify --certificate-identity-regexp '@siderolabs\.com$' --certificate-oi | [i915-ucode](firmware/i915-ucode/) | [ghcr.io/siderolabs/i915-ucode](https://github.com/siderolabs/extensions/pkgs/container/i915-ucode) | Intel GPU firmware | `linux firmware version` | | [intel-ice-firmware](firmware/intel-ice-firmware/) | [ghcr.io/siderolabs/intel-ice-firmware](https://github.com/siderolabs/extensions/pkgs/container/intel-ice-firmware) | Intel ICE NIC firmware | `linux firmware version` | | [intel-ucode](firmware/intel-ucode/) | [ghcr.io/siderolabs/intel-ucode](https://github.com/siderolabs/extensions/pkgs/container/intel-ucode) | Intel CPU microcode updates | `upstream version` | +| [qlogic-firmware](firmware/qlogic-firmware/) | [ghcr.io/siderolabs/qlogic-firmware](https://github.com/siderolabs/extensions/pkgs/container/qlogic-firmware) | Qlogic firmware | `linux firmware version` | ### Drivers diff --git a/firmware/qlogic-firmware/manifest.yaml b/firmware/qlogic-firmware/manifest.yaml new file mode 100644 index 00000000..2ad550c1 --- /dev/null +++ b/firmware/qlogic-firmware/manifest.yaml @@ -0,0 +1,10 @@ +version: v1alpha1 +metadata: + name: qlogic-firmware + version: "$VERSION" + author: Sidero Labs + description: | + This system extension provides firmware for QLogic devices. + compatibility: + talos: + version: ">= v1.0.0" diff --git a/firmware/qlogic-firmware/pkg.yaml b/firmware/qlogic-firmware/pkg.yaml new file mode 100644 index 00000000..5da8551c --- /dev/null +++ b/firmware/qlogic-firmware/pkg.yaml @@ -0,0 +1,19 @@ +name: qlogic-firmware +variant: scratch +shell: /toolchain/bin/bash +dependencies: + - stage: base + - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" +steps: + - prepare: + - | + sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml + install: + - | + mkdir -p /rootfs/lib/firmware + cp -R -p /lib/firmware/qed /rootfs/lib/firmware +finalize: + - from: /rootfs + to: /rootfs + - from: /pkg/manifest.yaml + to: / diff --git a/firmware/qlogic-firmware/vars.yaml b/firmware/qlogic-firmware/vars.yaml new file mode 100644 index 00000000..4d4aca48 --- /dev/null +++ b/firmware/qlogic-firmware/vars.yaml @@ -0,0 +1 @@ +VERSION: "{{ .LINUX_FIRMWARE_VERSION }}"