From 3548a761a5a7b807a8c027bea17f8cafa9d093d9 Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Tue, 19 May 2026 12:03:39 +0200 Subject: [PATCH] daedalus-v4l2{,-dkms}: fix hallucinated upstream commit SHA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The recipes pinned `f55b2cdab8a8c0bc04e8c1bb1d0b6ca85e7d96d2` as the "Phase 8.13: byte-exact end-to-end via libva" commit, but that SHA does not exist in git.reauktion.de/reauktion/daedalus-v4l2. The actual `main` tip (per gitea's for-each-ref) is `f55b2cd002afdfd08f3c093627317f92e4929074` — same 7-char prefix (`f55b2cd`), different full hash. Likely a manually-constructed SHA based on a short prefix from a working copy that was never pushed. git archive --format=tar.gz on the bad SHA fails with fatal: not a tree object: f55b2cdab8a8... which surfaces as 500 from Gitea's archive endpoint, which curl in the CI build-deb.sh sees as `curl: (22) ... error: 500`. Diagnosed by tailing gitea.log during a fresh archive request from the CI runner; the underlying `git archive` command in the gitea container is logged with the full failing SHA + error. Fixed in all four recipes (arch + debian, daedalus-v4l2 + dkms). pkgrel bumped to signal new build (PKGVER short-prefix `gf55b2cd` stays the same — both bad and good SHA share that prefix). --- arch/daedalus-v4l2-dkms/PKGBUILD | 4 ++-- arch/daedalus-v4l2/PKGBUILD | 4 ++-- debian/daedalus-v4l2-dkms/build-deb.sh | 4 ++-- debian/daedalus-v4l2/build-deb.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/daedalus-v4l2-dkms/PKGBUILD b/arch/daedalus-v4l2-dkms/PKGBUILD index 386b2fb8a..c7c8cfe37 100644 --- a/arch/daedalus-v4l2-dkms/PKGBUILD +++ b/arch/daedalus-v4l2-dkms/PKGBUILD @@ -18,10 +18,10 @@ _module=daedalus_v4l2 # Same pin as arch/daedalus-v4l2 — keep kernel module + daemon # bit-versioned together so the chardev wire protocol stays in sync. -_commit=f55b2cdab8a8c0bc04e8c1bb1d0b6ca85e7d96d2 +_commit=f55b2cd002afdfd08f3c093627317f92e4929074 pkgver=0.1.0.r16.f55b2cd -pkgrel=1 +pkgrel=2 # pkgrel=2 — corrected hallucinated _commit (was f55b2cdab... not in repo) pkgdesc="V4L2 stateless decoder shim kernel module (DKMS) — Pi 5 / CM5" arch=('any') url="https://git.reauktion.de/reauktion/daedalus-v4l2" diff --git a/arch/daedalus-v4l2/PKGBUILD b/arch/daedalus-v4l2/PKGBUILD index ce4289e09..9e299d903 100644 --- a/arch/daedalus-v4l2/PKGBUILD +++ b/arch/daedalus-v4l2/PKGBUILD @@ -21,12 +21,12 @@ _upstreampkg=daedalus-v4l2 # ffmpeg -hwaccel vaapi → libva → /dev/video0 → daemon path lands a # pixel-correct decoded frame back in ffmpeg. Promote to a later pin # only after a future phase closes cleanly. -_commit=f55b2cdab8a8c0bc04e8c1bb1d0b6ca85e7d96d2 +_commit=f55b2cd002afdfd08f3c093627317f92e4929074 # 0.1.0 (pre-1.0) + commit count + short sha. Bump the .Y on each # Phase 8.x close. pkgver() recomputes at build time. pkgver=0.1.0.r16.f55b2cd -pkgrel=1 +pkgrel=2 # pkgrel=2 — corrected hallucinated _commit (was f55b2cdab... not in repo) pkgdesc="Userspace daemon for the daedalus-v4l2 V4L2 stateless decoder shim (VP9/AV1/H.264 on Pi 5 / CM5)" arch=('aarch64') url="https://git.reauktion.de/reauktion/daedalus-v4l2" diff --git a/debian/daedalus-v4l2-dkms/build-deb.sh b/debian/daedalus-v4l2-dkms/build-deb.sh index 6f9b75b1f..1fe60eff0 100755 --- a/debian/daedalus-v4l2-dkms/build-deb.sh +++ b/debian/daedalus-v4l2-dkms/build-deb.sh @@ -14,9 +14,9 @@ # Sibling userspace package: ../daedalus-v4l2/build-deb.sh set -euo pipefail -UPSTREAM_COMMIT=f55b2cdab8a8c0bc04e8c1bb1d0b6ca85e7d96d2 +UPSTREAM_COMMIT=f55b2cd002afdfd08f3c093627317f92e4929074 PKGVER=0.1.0+r16+gf55b2cd -PKGREL=1 +PKGREL=2 # pkgrel=2 — corrected upstream commit SHA MODULE_NAME=daedalus_v4l2 HERE=$(dirname "$(readlink -f "$0")") diff --git a/debian/daedalus-v4l2/build-deb.sh b/debian/daedalus-v4l2/build-deb.sh index 301ec02ae..efca2a1ab 100755 --- a/debian/daedalus-v4l2/build-deb.sh +++ b/debian/daedalus-v4l2/build-deb.sh @@ -15,9 +15,9 @@ set -euo pipefail # end-to-end via libva (consumer target hit)" — first commit where the # full ffmpeg -hwaccel vaapi → libva → /dev/video0 → daemon path lands # a pixel-correct decoded frame back in ffmpeg. -UPSTREAM_COMMIT=f55b2cdab8a8c0bc04e8c1bb1d0b6ca85e7d96d2 +UPSTREAM_COMMIT=f55b2cd002afdfd08f3c093627317f92e4929074 PKGVER=0.1.0+r16+gf55b2cd -PKGREL=2 # pkgrel=2 — Depends on ffmpeg-v4l2-request-fourier (Path A SONAME .so.62) +PKGREL=3 # pkgrel=3 — corrected upstream commit SHA (was hallucinated) (Path A SONAME .so.62) HERE=$(dirname "$(readlink -f "$0")")