Version in base suite: 20250130-3 Base version: asahi-scripts_20250130-3 Target version: asahi-scripts_20250130-3+deb13u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/a/asahi-scripts/asahi-scripts_20250130-3.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/a/asahi-scripts/asahi-scripts_20250130-3+deb13u1.dsc changelog | 17 ++ gbp.conf | 2 patches/0000-Backport-asahi-diagnose-Fix-macaudio-default-profile.patch | 22 +++ patches/0000-Backport-asahi-diagnose-drop-tas2764-checks.patch | 60 ++++++++++ patches/0000-Backport-update-m1n1-clobber-boot.bin.old-only-on-changes.patch | 31 +++++ patches/0003-debian-Add-initramfs-tools-implementation-for-cpio-f.patch | 13 +- patches/0005-asahi-diagnose-update-doc-link.patch | 6 - patches/series | 3 8 files changed, 145 insertions(+), 9 deletions(-) diff -Nru asahi-scripts-20250130/debian/changelog asahi-scripts-20250130/debian/changelog --- asahi-scripts-20250130/debian/changelog 2025-04-15 07:39:19.000000000 +0000 +++ asahi-scripts-20250130/debian/changelog 2025-11-01 18:48:50.000000000 +0000 @@ -1,3 +1,20 @@ +asahi-scripts (20250130-3+deb13u1) trixie; urgency=medium + + * Team upload. + * d/patches: + - add 0000-Backport-asahi-diagnose-Fix-macaudio-default-profile.patch + to fix the macaudio default profile check (Closes: #1112262) + - add 0000-Backport-asahi-diagnose-drop-tas2764-checks.patch to drop + the tas2764 quirk checks (Closes: #1112262) + - 0003-debian-Add-initramfs-tools-implementation-for-cpio-f.patch: + add the apple_nvmem_spmi module to the initramfs explicitly and + obsolete simple-mfd-spmi and nvmem_spmi_mfd (Closes: #1112264) + - add 0000-Backport-update-m1n1-clobber-boot.bin.old-only-on-changes.patch + to make update-m1n1 idempotent (Closes: #1112265) + - refresh + + -- NoisyCoil Sat, 01 Nov 2025 19:48:50 +0100 + asahi-scripts (20250130-3) unstable; urgency=medium * Team upload. diff -Nru asahi-scripts-20250130/debian/gbp.conf asahi-scripts-20250130/debian/gbp.conf --- asahi-scripts-20250130/debian/gbp.conf 2023-11-15 11:18:17.000000000 +0000 +++ asahi-scripts-20250130/debian/gbp.conf 2025-11-01 18:48:38.000000000 +0000 @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/unstable +debian-branch = debian/trixie upstream-branch = main dist = DEP14 pristine-tar = False diff -Nru asahi-scripts-20250130/debian/patches/0000-Backport-asahi-diagnose-Fix-macaudio-default-profile.patch asahi-scripts-20250130/debian/patches/0000-Backport-asahi-diagnose-Fix-macaudio-default-profile.patch --- asahi-scripts-20250130/debian/patches/0000-Backport-asahi-diagnose-Fix-macaudio-default-profile.patch 1970-01-01 00:00:00.000000000 +0000 +++ asahi-scripts-20250130/debian/patches/0000-Backport-asahi-diagnose-Fix-macaudio-default-profile.patch 2025-11-01 18:48:38.000000000 +0000 @@ -0,0 +1,22 @@ +From: Dan Berindei +Date: Fri, 6 Jun 2025 09:59:29 +0300 +Subject: asahi-diagnose: Fix macaudio default profile check + +Signed-off-by: Dan Berindei +--- + asahi-diagnose | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/asahi-diagnose b/asahi-diagnose +index 5062387..8e9ea7e 100755 +--- a/asahi-diagnose ++++ b/asahi-diagnose +@@ -73,7 +73,7 @@ EOF + check_macaudio_profile() { + local profile_config="${HOME}/.local/state/wireplumber/default-profile" + [ -e ${profile_config} ] \ +- && grep alsa_card.platform-sound ${profile_config} | sed -e 's/.*=//' \ ++ && sed -ne 's/^alsa_card.platform-sound=// p' ${profile_config} | grep . \ + || echo "Default" + } + macaudio_profile=$(check_macaudio_profile) diff -Nru asahi-scripts-20250130/debian/patches/0000-Backport-asahi-diagnose-drop-tas2764-checks.patch asahi-scripts-20250130/debian/patches/0000-Backport-asahi-diagnose-drop-tas2764-checks.patch --- asahi-scripts-20250130/debian/patches/0000-Backport-asahi-diagnose-drop-tas2764-checks.patch 1970-01-01 00:00:00.000000000 +0000 +++ asahi-scripts-20250130/debian/patches/0000-Backport-asahi-diagnose-drop-tas2764-checks.patch 2025-11-01 18:48:38.000000000 +0000 @@ -0,0 +1,60 @@ +From: NoisyCoil +Date: Tue, 19 Aug 2025 02:32:46 +0200 +Subject: asahi-diagnose: drop the tas2764 quirk checks + +The quirks were upstreamed in 6.16 and are not enabled by a kernel parameter +anymore. Because of left-over checks, asahi-diagnose tells users 'Your audio +configuration is in an invalid state', which is not true. + +Signed-off-by: NoisyCoil +--- + asahi-diagnose | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/asahi-diagnose b/asahi-diagnose +index 8e9ea7e..fe520d5 100755 +--- a/asahi-diagnose ++++ b/asahi-diagnose +@@ -111,16 +111,6 @@ check_audio_macaudio() { + } + bad_macaudio_params=$(check_audio_macaudio) + +-# Check that snd-soc-tas2764.apple_quirks=0x3f is being applied +-check_audio_tas2764() { +- [ -e /sys/module/snd_soc_tas2764/ ] && ( +- grep "63" /sys/module/snd_soc_tas2764/parameters/apple_quirks > /dev/null \ +- && echo "yes" \ +- || echo "no" +- ) || echo "N/A" +-} +-tas2764_quirks=$(check_audio_tas2764) +- + audio_config() { + cat < +Date: Sun, 27 Apr 2025 12:47:21 +0200 +Subject: update-m1n1: clobber boot.bin.old only if boot.bin changes + +Uses `sha512sum` instead of `cmp` to avoid a dependency on diffutils. + +Signed-off-by: Janne Grunau +--- + update-m1n1 | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/update-m1n1 b/update-m1n1 +index 9dd745c..5520ee2 100755 +--- a/update-m1n1 ++++ b/update-m1n1 +@@ -56,7 +56,14 @@ cat "$M1N1" $DTBS >"${TARGET}.new" + gzip -c "$U_BOOT" >>"${TARGET}.new" + cat "$m1n1config" >>"${TARGET}.new" + +-[ -e "$TARGET" ] && mv -f "$TARGET" "${TARGET}.old" ++if [ -e "$TARGET" ]; then ++ # clobber "${TARGET}.old" only if "$TARGET" changes, use sha512sum to ++ # avoid dependency on diffutils ++ SHA512_CUR=$(sha512sum "$TARGET" | cut -d' ' -f1) ++ SHA512_NEW=$(sha512sum "$TARGET.new" | cut -d' ' -f1) ++ [ "$SHA512_CUR" != "$SHA512_NEW" ] && mv -f "$TARGET" "${TARGET}.old" ++fi ++ + mv -f "${TARGET}.new" "$TARGET" + + echo "m1n1 updated at ${TARGET}" diff -Nru asahi-scripts-20250130/debian/patches/0003-debian-Add-initramfs-tools-implementation-for-cpio-f.patch asahi-scripts-20250130/debian/patches/0003-debian-Add-initramfs-tools-implementation-for-cpio-f.patch --- asahi-scripts-20250130/debian/patches/0003-debian-Add-initramfs-tools-implementation-for-cpio-f.patch 2025-04-15 07:17:24.000000000 +0000 +++ asahi-scripts-20250130/debian/patches/0003-debian-Add-initramfs-tools-implementation-for-cpio-f.patch 2025-11-01 18:48:38.000000000 +0000 @@ -11,10 +11,10 @@ functions.sh | 4 +-- initramfs/hooks/asahi | 39 ++++++++++++++++++++++++ initramfs/kernel/zz-update-m1n1 | 26 ++++++++++++++++ - initramfs/modules | 40 ++++++++++++++++++++++++ + initramfs/modules | 43 ++++++++++++++++++++++++++ initramfs/scripts/init-bottom/asahi | 19 ++++++++++++ initramfs/scripts/init-top/asahi | 61 +++++++++++++++++++++++++++++++++++++ - 7 files changed, 201 insertions(+), 3 deletions(-) + 7 files changed, 204 insertions(+), 3 deletions(-) create mode 100644 initramfs/hooks/asahi create mode 100644 initramfs/kernel/zz-update-m1n1 create mode 100644 initramfs/modules @@ -155,10 +155,10 @@ +exit 0 diff --git a/initramfs/modules b/initramfs/modules new file mode 100644 -index 0000000..0fe204f +index 0000000..6cbe56c --- /dev/null +++ b/initramfs/modules -@@ -0,0 +1,40 @@ +@@ -0,0 +1,43 @@ +# For NVMe & SMC +apple-mailbox +# For NVMe @@ -187,8 +187,11 @@ +spi-hid-apple-of +# For RTC +rtc-macsmc -+simple-mfd-spmi +spmi-apple-controller ++apple_nvmem_spmi ++# For RTC, obsoleted by linux 6.15, ++# drop in future release ++simple-mfd-spmi +nvmem_spmi_mfd +# For MTP HID +apple-dockchannel diff -Nru asahi-scripts-20250130/debian/patches/0005-asahi-diagnose-update-doc-link.patch asahi-scripts-20250130/debian/patches/0005-asahi-diagnose-update-doc-link.patch --- asahi-scripts-20250130/debian/patches/0005-asahi-diagnose-update-doc-link.patch 2025-04-15 07:39:14.000000000 +0000 +++ asahi-scripts-20250130/debian/patches/0005-asahi-diagnose-update-doc-link.patch 2025-11-01 18:48:38.000000000 +0000 @@ -9,12 +9,12 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asahi-diagnose b/asahi-diagnose -index db894a8..dcf2fea 100755 +index 02f2c26..870b3f2 100755 --- a/asahi-diagnose +++ b/asahi-diagnose -@@ -277,7 +277,7 @@ diagnose() { +@@ -264,7 +264,7 @@ diagnose() { + [ "$racy_build" = "yes" ] && echo " - You have files in /usr/share/ from a prerelease version of asahi-audio." [ "$bad_macaudio_params" = "yes" ] && echo " - You have tried to manually circumvent our kernel-level safety controls." - [ "$tas2764_quirks" = "no" ] && echo " - Required speaker codec settings are not being applied." ) - echo "Please go to https://github.com/AsahiLinux/docs/wiki/Undoing-early-speaker-support-hacks for fixes." + echo "Please go to https://asahilinux.org/docs/sw/undoing-early-speaker-hacks/ for fixes." diff -Nru asahi-scripts-20250130/debian/patches/series asahi-scripts-20250130/debian/patches/series --- asahi-scripts-20250130/debian/patches/series 2025-04-15 07:39:14.000000000 +0000 +++ asahi-scripts-20250130/debian/patches/series 2025-11-01 18:48:38.000000000 +0000 @@ -1,3 +1,6 @@ +0000-Backport-asahi-diagnose-Fix-macaudio-default-profile.patch +0000-Backport-asahi-diagnose-drop-tas2764-checks.patch +0000-Backport-update-m1n1-clobber-boot.bin.old-only-on-changes.patch 0001-debian-add-install-debian-target.patch 0002-debian-Adjust-update-m1n1-for-debian.patch 0003-debian-Add-initramfs-tools-implementation-for-cpio-f.patch