From 8eb301cd3e9bbd6a0d06478773547ac0a32b5d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Skyler=20M=C3=A4ntysaari?= Date: Sun, 14 Jul 2024 08:59:02 +0300 Subject: [PATCH] feat(dvb-si2168): add dvb-si2168-firmware extension MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Skyler Mäntysaari --- .kres.yaml | 1 + Makefile | 5 ++-- Pkgfile | 1 + firmware/dvb-si2168-firmware/manifest.yaml | 10 +++++++ firmware/dvb-si2168-firmware/pkg.yaml | 34 ++++++++++++++++++++++ firmware/dvb-si2168-firmware/vars.yaml | 1 + 6 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 firmware/dvb-si2168-firmware/manifest.yaml create mode 100644 firmware/dvb-si2168-firmware/pkg.yaml create mode 100644 firmware/dvb-si2168-firmware/vars.yaml diff --git a/.kres.yaml b/.kres.yaml index 1881d262..09e7277d 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -10,6 +10,7 @@ spec: - chelsio-drivers - chelsio-firmware - drbd + - dvb-si2168-firmware - ecr-credential-provider - fuse3 - gasket-driver diff --git a/Makefile b/Makefile index b33b1886..d3b465c4 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-07-04T10:11:27Z by kres 8c8b007. +# Generated on 2024-07-16T06:34:06Z by kres ac94478. # common variables @@ -13,7 +13,7 @@ IMAGE_TAG ?= $(TAG) OPERATING_SYSTEM := $(shell uname -s | tr '[:upper:]' '[:lower:]') GOARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/') REGISTRY ?= ghcr.io -USERNAME ?= siderolabs +USERNAME ?= skyssolutions REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME) KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest @@ -61,6 +61,7 @@ TARGETS += btrfs TARGETS += chelsio-drivers TARGETS += chelsio-firmware TARGETS += drbd +TARGETS += dvb-si2168-firmware TARGETS += ecr-credential-provider TARGETS += fuse3 TARGETS += gasket-driver diff --git a/Pkgfile b/Pkgfile index 8a991780..83709077 100644 --- a/Pkgfile +++ b/Pkgfile @@ -7,6 +7,7 @@ vars: DRBD_DRIVER_VERSION: 9.2.9 # update this when updating PKGS_VERSION in Makefile ZFS_DRIVER_VERSION: 2.2.4 # update this when updating PKGS_VERSION in Makefile UTIL_LINUX_VERSION: 2.40.1 # update this when updating PKGS_VERSION in Makefile + LINUX_DVB_FIRMWARE: 0.0.51 # renovate: datasource=git-tags extractVersion=^libtiprc-(?.*)$ depName=git://linux-nfs.org/~steved/libtirpc LIBTIRPC_VERSION: 1-3-3 diff --git a/firmware/dvb-si2168-firmware/manifest.yaml b/firmware/dvb-si2168-firmware/manifest.yaml new file mode 100644 index 00000000..53125fac --- /dev/null +++ b/firmware/dvb-si2168-firmware/manifest.yaml @@ -0,0 +1,10 @@ +version: v1alpha1 +metadata: + name: dvb-si2168-firmware + version: "$VERSION" + author: Skyler Mäntysaari + description: | + This system extension provides dvb-si2168 firmware + compatibility: + talos: + version: ">= v1.0.0" diff --git a/firmware/dvb-si2168-firmware/pkg.yaml b/firmware/dvb-si2168-firmware/pkg.yaml new file mode 100644 index 00000000..a055a0a5 --- /dev/null +++ b/firmware/dvb-si2168-firmware/pkg.yaml @@ -0,0 +1,34 @@ +name: dvb-si2168-firmware +variant: scratch +shell: /toolchain/bin/bash +dependencies: + - stage: base +steps: + - sources: + - url: https://github.com/OpenELEC/dvb-firmware/archive/refs/tags/{{ .LINUX_DVB_FIRMWARE }}.tar.gz + destination: dvb-firmware.tar.gz + sha256: cef3ce537d213e020af794cecf9de207e2882c375ceda39102eb6fa2580bad8d + sha512: 2372dba98083c76865f5f0f8101b1160888e03cdbe911dd08621e7b6f38e8a25ae5d56eefc21728bf65fd09ea613b53606df4021d3972b0bc9d2bd8b6cbe20a1 + prepare: + - | + sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml + - | + tar -xvf dvb-firmware.tar.gz + rm dvb-firmware.tar.gz + install: + - | + mkdir -p /rootfs/lib/firmware + cp dvb-firmware-0.0.51/firmware/dvb-demod-si2168-02.fw /rootfs/lib/firmware + cp dvb-firmware-0.0.51/firmware/dvb-demod-si2168-b40-01.fw /rootfs/lib/firmware + cp dvb-firmware-0.0.51/firmware/v4l-cx23885-avcore-01.fw /rootfs/lib/firmware + 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: / diff --git a/firmware/dvb-si2168-firmware/vars.yaml b/firmware/dvb-si2168-firmware/vars.yaml new file mode 100644 index 00000000..4c84ba0a --- /dev/null +++ b/firmware/dvb-si2168-firmware/vars.yaml @@ -0,0 +1 @@ +VERSION: "{{ .LINUX_DVB_FIRMWARE }}"