Merge pull request 'linux-ampere-fourier: bump to kafr2 (v7.0-rc3 + kernel-agent manifest, VP9 + AV1)' (#27) from claude-noether/marfrit-packages:noether/linux-ampere-fourier-kafr2 into main

Reviewed-on: #27

arch/linux-ampere-fourier/PKGBUILD

@@ -1,14 +1,21 @@
 # Maintainer: Markus Fritsche <mfritsche@reauktion.de>
 #
-# linux-ampere-fourier — CoolPi GenBook (RK3588) kernel from the
+# linux-ampere-fourier — CoolPi GenBook (RK3588) kernel built from the
-# marfrit-iterated linux-rk3588-marfrit branch (pinned commit).
+# kernel-agent fleet/ampere.yaml manifest applied to mainline v7.0-rc3.
 #
-# Baseline carries the marfrit RK3588 delta on top of mainline v7.0-rc3:
+# kafr2 baseline (2026-05-18): mainline v7.0-rc3 + the 10 scope-tagged
-# 10 Markus commits (board DTS + Kconfig + suspend/wakeup + bluetooth)
+# kernel-agent patches under patches/{soc,module,board,driver}/:
-# plus 8 upstream cherry-picks (Shawn Lin's pcie3 phy series, Collabora
+#   - 1 soc/rk3588 pwm15 pinctrl
-# clk/dts/dw-dp fixes, Sebastian Reichel's Rock 5 ITX hdmirx). The 6
+#   - 6 board/coolpi-cm5-genbook DTS patches (pwm-fan, RK806 power-off,
-# board-relevant patches are scope-tagged in marfrit/kernel-agent under
+#     speaker, USB-C PD, lid switch + USB3 PHY, microphone)
-# patches/{soc,module,board}/ — see fleet/ampere.yaml manifest.
+#   - 3 driver/media VP9-on-VDPU381 patches (Sarma's v8 series, imported
+#     via marfrit/kernel-agent#12 closure and PR #24)
+#
+# Drops the prior f8f3ad9 baseline ("18 commits ahead") because that tip
+# black-screens ampere — kernel-agent's ka-promote produces this 10-patch
+# minimal set from fleet/ampere.yaml. End-to-end VP9 + AV1 (av1-vpu-dec
+# is mainline-7.0) decode verified bit-exact via kdirect on the
+# hand-built tip 48a8c78 before this package iteration was cut.
 #
 # Coexists with the user's other extlinux labels in
 # /boot/firmware/extlinux/extlinux.conf; never edits them. Adds a
@@ -21,9 +28,9 @@
 
 pkgbase=linux-ampere-fourier
 pkgname=("$pkgbase" "$pkgbase-headers")
-pkgver=7.0rc3.kafr1
+pkgver=7.0rc3.kafr2
 pkgrel=1
-pkgdesc='CoolPi GenBook kernel (linux-rk3588-marfrit @ f8f3ad9 + RK3588 cherry-picks + GenBook DTS)'
+pkgdesc='CoolPi GenBook kernel (v7.0-rc3 + kernel-agent fleet/ampere.yaml — 6 board patches + 3 VP9-VDPU381 + 1 pwm15)'
 arch=(aarch64)
 url='https://git.reauktion.de/marfrit/kernel-agent'
 license=(GPL-2.0-only)
@@ -34,13 +41,24 @@ makedepends=(
 )
 options=('!strip')
 
-# Pinned tip of marfrit/linux-rk3588-marfrit. 18 commits ahead of v7.0-rc3:
+# Pinned tip of the kernel-agent-managed source tree for ampere.
-#   10 by Markus Fritsche  (board/SoC/module/Bluetooth/Kconfig)
+# 10 commits ahead of v7.0-rc3, exactly mirroring fleet/ampere.yaml's
-#    4 by Shawn Lin        (phy: rockchip-snps-pcie3 stability series)
+# manifest under apply order:
-#    2 by Cristian Ciocaltea (clk + dw-dp bridge — Collabora track)
+#   - c57d069 soc/rk3588: pwm15 pinctrl entries
-#    1 by Sebastian Reichel (Rock 5 ITX hdmirx — not used by ampere)
+#   - 05a915c board/genbook: pwm-fan with thermal cooling
-#    1 by Pedro Alves      (CLK_SET_RATE_PARENT VOP2 fix)
+#   - d007b90 module/coolpi-cm5: RK806 system-power-controller
-_commit=f8f3ad934433bd7e1207d9b0b37e817a692b7ee9
+#   - 3722eab board/genbook: speaker via audio-graph-card
+#   - 3e42ab6 board/genbook: USB-C PD via FUSB302
+#   - 7c241f2 board/genbook: lid switch + USB3 PHY lane
+#   - dd545fa board/genbook: wire internal microphone
+#   - 9ddcae5 driver/media: rkvdec-vp9 helper rename (Sarma)
+#   - c5063d9 driver/media: rkvdec move vp9 to common (Sarma)
+#   - 48a8c78 driver/media: rkvdec VP9 for VDPU381 (Sarma)
+#
+# This is the same tree state ka-promote ampere produces as cumulative.patch
+# (see marfrit/kernel-agent build/ampere/v7.0-rc3/manifest.lock for the
+# b2sum + per-patch sha256s).
+_commit=48a8c785de7f5320513052a64e544c6310d7b273
 
 source=(
   # Local tarball produced by ./prebuild.sh from a local clone of the

arch/linux-ampere-fourier/prebuild.sh

@@ -19,8 +19,11 @@
 set -euo pipefail
 
 TREE="${LINUX_RK3588_MARFRIT_TREE:-${HOME}/src/linux-rockchip}"
-COMMIT=f8f3ad934433bd7e1207d9b0b37e817a692b7ee9
+COMMIT=48a8c785de7f5320513052a64e544c6310d7b273
-SHA256_EXPECTED=b4eca11e883fe6f7f306d8751c3efa3afed9cc3465c74a3320de1b7204f5f330
+# Generated tarball sha varies with gzip version — script warns-not-fails.
+# Leave EXPECTED empty for fresh kafr2 builds; first successful build can
+# pin a canonical sha here if a reproducibility audit needs it.
+SHA256_EXPECTED=
 
 HERE="$(cd "$(dirname "$0")" && pwd)"
 OUTPUT="${HERE}/linux-rk3588-marfrit-${COMMIT:0:7}.tar.gz"