Hi, On Fri Oct 17, 2025 at 11:10 PM CEST, Johannes Schauer Marin Rodrigues wrote: > On Thu, 16 Oct 2025 15:17:57 +0200 Diederik de Haas <didi.debian@cknow.org> wrote: >> I tried if the following patch would fix it: >> >> ``` >> diff --git a/debian/config/misc-nonfree/defines b/debian/config/misc-nonfree/defines >> index 71a7ae3..86ca756 100644 >> --- a/debian/config/misc-nonfree/defines >> +++ b/debian/config/misc-nonfree/defines >> @@ -32,7 +32,7 @@ files: >> 3com/typhoon.bin >> advansys/* >> amphion/vpu/* >> - arm/mali/arch10.8/mali_csffw.bin >> + arm/mali/* >> brcm/BCM-0a5c-6410.hcd >> brcm/BCM-0bb4-0306.hcd >> cadence/mhdp8546.bin >> ``` > > I tried this patch: > > --- a/debian/config/misc-nonfree/defines > +++ b/debian/config/misc-nonfree/defines > @@ -32,7 +32,7 @@ files: > 3com/typhoon.bin > advansys/* > amphion/vpu/* > - arm/mali/arch10.8/mali_csffw.bin > + arm/mali/arch10.*/mali_csffw.bin > brcm/BCM-0a5c-6410.hcd > brcm/BCM-0bb4-0306.hcd > cadence/mhdp8546.bin > > And with that, the resulting package (built on salsa) has: > > drwxr-xr-x root/root 0 2025-10-15 16:02 ./usr/lib/firmware/arm/ > drwxr-xr-x root/root 0 2025-10-15 16:02 ./usr/lib/firmware/arm/mali/ > drwxr-xr-x root/root 0 2025-10-15 16:02 ./usr/lib/firmware/arm/mali/arch10.10/ > -rw-r--r-- root/root 282624 2025-10-15 16:02 ./usr/lib/firmware/arm/mali/arch10.10/mali_csffw.bin > drwxr-xr-x root/root 0 2025-10-15 16:02 ./usr/lib/firmware/arm/mali/arch10.12/ > lrwxrwxrwx root/root 0 2025-10-15 16:02 ./usr/lib/firmware/arm/mali/arch10.12/mali_csffw.bin -> ../arch10.10/mali_csffw.bin > drwxr-xr-x root/root 0 2025-10-15 16:02 ./usr/lib/firmware/arm/mali/arch10.8/ > lrwxrwxrwx root/root 0 2025-10-15 16:02 ./usr/lib/firmware/arm/mali/arch10.8/mali_csffw.bin -> ../arch10.10/mali_csffw.bin Thanks for that :-) Because of that I realized my glob pattern was wrong. So I found which pattern I should use and with that, all Arm Mali firmware was packaged. I've attached the patch and submitted it as MR here: https://salsa.debian.org/kernel-team/firmware-nonfree/-/merge_requests/132 Cheers, Diederik
From 533598df16aa79ffad3a359a90912a65f49e3f3f Mon Sep 17 00:00:00 2001
From: Diederik de Haas <didi.debian@cknow.org>
Date: Thu, 16 Oct 2025 13:22:20 +0200
Subject: [PATCH] misc-nonfree: Include all Arm Mali firware
Various new Arm Mali firmware files were added in upstream commit
930ef9046e38 ("panthor: Add firmware for more Mali GPUs")
Therefore extend the defines pattern to include them all.
Also extend the copyright pattern in a similar vein as the new files are
licensed under the same license terms as the existing file.
Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
---
debian/changelog | 7 +++++++
debian/config/misc-nonfree/defines | 2 +-
debian/copyright | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1fef5c9..53cbe92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+firmware-nonfree (20250917-2) UNRELEASED; urgency=medium
+
+ [ Diederik de Haas ]
+ * misc-nonfree: Include all Arm Mali firware (Closes: #1118195)
+
+ -- Ben Hutchings <benh@debian.org> Thu, 16 Oct 2025 14:47:00 +0200
+
firmware-nonfree (20250917-1) unstable; urgency=medium
[ Ben Hutchings ]
diff --git a/debian/config/misc-nonfree/defines b/debian/config/misc-nonfree/defines
index 71a7ae3..f1c44db 100644
--- a/debian/config/misc-nonfree/defines
+++ b/debian/config/misc-nonfree/defines
@@ -32,7 +32,7 @@ files:
3com/typhoon.bin
advansys/*
amphion/vpu/*
- arm/mali/arch10.8/mali_csffw.bin
+ arm/mali/**/*
brcm/BCM-0a5c-6410.hcd
brcm/BCM-0bb4-0306.hcd
cadence/mhdp8546.bin
diff --git a/debian/copyright b/debian/copyright
index f649657..671975e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -279,7 +279,7 @@ Files: ar3k/* ar5523.bin ath3k-1.fw
Copyright: 2008-2010, Atheros Communications, Inc.
License: binary-redist-Atheros
-Files: arm/mali/arch10.8/mali_csffw.bin
+Files: arm/mali/*
Copyright: 2023, Arm Ltd.
License: binary-redist-Arm-CSF
--
2.51.0
Attachment:
signature.asc
Description: PGP signature