[PR PATCH] asahi: routine updates

[PR PATCH] asahi: routine updates

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 441 bytes --]

There is a new pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages asahi
https://github.com/void-linux/void-packages/pull/54223

asahi: routine updates
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (aarch64-glibc)

[ci skip]
cc @classabbyamp  

A patch file from https://github.com/void-linux/void-packages/pull/54223.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-asahi-54223.patch --]
[-- Type: text/x-diff, Size: 8507 bytes --]

From 8b0607743e917fc55778142caf662ea2a8cd408d Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Wed, 5 Feb 2025 12:16:12 +0100
Subject: [PATCH 1/4] m1n1: update to 1.4.21, add mitigations to hook

---
 srcpkgs/m1n1/files/kernel.d/m1n1.post-install |  2 +-
 srcpkgs/m1n1/files/m1n1.conf                  | 23 -------------------
 srcpkgs/m1n1/template                         | 12 ++++++----
 3 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/m1n1/files/m1n1.conf

diff --git a/srcpkgs/m1n1/files/kernel.d/m1n1.post-install b/srcpkgs/m1n1/files/kernel.d/m1n1.post-install
index ed15e7c23f46bf..0bda2bcf096595 100755
--- a/srcpkgs/m1n1/files/kernel.d/m1n1.post-install
+++ b/srcpkgs/m1n1/files/kernel.d/m1n1.post-install
@@ -22,7 +22,7 @@ if [ -e "$CONFIG" ]; then
 		case "$line" in
 			"") ;;
 			\#*) ;;
-			chosen.*=*|display=*)
+			chosen.*=*|display=*|mitigations=*)
 				echo "$line" >> "$m1n1config"
 				echo "Option: $line"
 				;;
diff --git a/srcpkgs/m1n1/files/m1n1.conf b/srcpkgs/m1n1/files/m1n1.conf
deleted file mode 100644
index 6d847452dc5ec1..00000000000000
--- a/srcpkgs/m1n1/files/m1n1.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# This configuration file specifies options for the m1n1 bootloader.
-#
-# Be careful when editing this file, as incorrect settings can cause your system to fail to boot.
-#
-# Display configuration (Mac Mini / Mac Studio only)
-
-# Force re-configuration of the display to defaults in m1n1 stage 2
-# This is redundant unless your m1n1 stage 1 is buggy or ancient
-#display=auto
-
-# Configure the boot display to the default 4K mode
-#display=3840x2160
-
-# Configure the boot display to 4K at 60Hz (or closest available)
-#display=3840x2160@60
-
-# Configure the boot display to 4K at 59.97Hz (or closest available)
-#display=3840x2160@59.94
-
-# Add an arbitrary property to /chosen in the device tree
-#chosen.foo=bar
-# chosen.bootargs=console=tty0 loglevel=4 root=/dev/nvme0n1p6 rootwait rw
-
diff --git a/srcpkgs/m1n1/template b/srcpkgs/m1n1/template
index 6cc93eeaa0133b..cefcbf09662c2c 100644
--- a/srcpkgs/m1n1/template
+++ b/srcpkgs/m1n1/template
@@ -1,7 +1,7 @@
 # Template file for 'm1n1'
 pkgname=m1n1
-version=1.4.17
-revision=2
+version=1.4.21
+revision=1
 archs="aarch64*"
 hostmakedepends="ImageMagick void-artwork"
 short_desc="Asahi Linux bootloader"
@@ -9,7 +9,7 @@ maintainer="Will Springer <skirmisher@protonmail.com>, dkwo <npiazza@disroot.org
 license="MIT"
 homepage="https://asahilinux.org"
 distfiles="https://github.com/AsahiLinux/m1n1/archive/refs/tags/v${version}.tar.gz"
-checksum=59c960ada35880bf39e033d6cc5ac0079a693a3bb17fb06dfe91e431d2773f96
+checksum=5e0239ff497a8694eaf650d292254aba7d45611f37393053558ee36886db4111
 conf_files="/etc/m1n1.conf /etc/default/m1n1-kernel-hook"
 
 post_extract() {
@@ -29,9 +29,11 @@ do_build() {
 
 do_install() {
 	vinstall build/m1n1.bin 644 usr/lib/asahi-boot
-	vlicense LICENSE
+}
 
-	vinstall ${FILESDIR}/m1n1.conf 644 etc m1n1.conf
+post_install() {
+	vlicense LICENSE
+	vinstall m1n1.conf.example 644 etc m1n1.conf
 	vinstall ${FILESDIR}/m1n1-kernel-hook.confd 644 etc/default m1n1-kernel-hook
 	vinstall ${FILESDIR}/kernel.d/m1n1.post-install 744 etc/kernel.d/post-install 50-m1n1
 }

From 32514c0881445b73bae69361b620bd6d1870e24d Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Wed, 5 Feb 2025 12:19:32 +0100
Subject: [PATCH 2/4] asahi-scripts: update to 20250130

---
 srcpkgs/asahi-scripts/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/asahi-scripts/template b/srcpkgs/asahi-scripts/template
index fc11affa7611af..3f634fbdc6289e 100644
--- a/srcpkgs/asahi-scripts/template
+++ b/srcpkgs/asahi-scripts/template
@@ -1,6 +1,6 @@
-# Template file for 'asahi-scripts'.
+# Template file for 'asahi-scripts'
 pkgname=asahi-scripts
-version=20240822
+version=20250130
 revision=1
 archs="aarch64*"
 build_style=gnu-makefile
@@ -11,11 +11,9 @@ maintainer="dkwo <npiazza@disroot.org>"
 license="MIT"
 homepage="https://github.com/AsahiLinux/asahi-scripts"
 distfiles="https://github.com/AsahiLinux/asahi-scripts/archive/refs/tags/${version}.tar.gz"
-checksum=24023903c1341d6867d9a2baa494bbae90ca27b6cf64fa19218ef87d471304fc
+checksum=a76c64bb971c45454454cdc0668a3f9401f1771c730e78da78bd022c74616c87
 make_dirs="/usr/lib/firmware/vendor 0755 root root"
 
 post_install() {
-	# config for m1n1, provided by that package
-	rm ${DESTDIR}/etc/m1n1.conf
 	vlicense LICENSE
 }

From 6f5d7f4c8bf083b33b9a11c9ba22f80a7575ab07 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Wed, 5 Feb 2025 12:23:07 +0100
Subject: [PATCH 3/4] asahi-base: switch to cp -a in tinyramfs hook

---
 srcpkgs/asahi-base/files/tinyramfs-hook-asahi.init.late | 2 +-
 srcpkgs/asahi-base/template                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/asahi-base/files/tinyramfs-hook-asahi.init.late b/srcpkgs/asahi-base/files/tinyramfs-hook-asahi.init.late
index d8619f6d19a93b..4987578a799ce7 100644
--- a/srcpkgs/asahi-base/files/tinyramfs-hook-asahi.init.late
+++ b/srcpkgs/asahi-base/files/tinyramfs-hook-asahi.init.late
@@ -5,5 +5,5 @@ mkdir -p "$loaderdir"
 mount -t tmpfs -o mode=0755 vendorfw "$loaderdir"
 
 set +f
-cp -pr /vendorfw/* /vendorfw/.vendorfw.manifest "$loaderdir"
+cp -a /vendorfw/* /vendorfw/.vendorfw.manifest "$loaderdir"
 set -f
diff --git a/srcpkgs/asahi-base/template b/srcpkgs/asahi-base/template
index bcab821c28e76c..dddf229785da8c 100644
--- a/srcpkgs/asahi-base/template
+++ b/srcpkgs/asahi-base/template
@@ -1,6 +1,6 @@
 # Template file for 'asahi-base'
 pkgname=asahi-base
-version=20250202
+version=20250205
 revision=1
 archs="aarch64*"
 build_style=meta

From c4198531f9b98f482a7401b46e67fc9381c4a8d7 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Wed, 5 Feb 2025 12:49:14 +0100
Subject: [PATCH 4/4] linux-asahi: update to 6.12.12+1

---
 srcpkgs/linux-asahi/files/arm64-dotconfig | 10 +++++-----
 srcpkgs/linux-asahi/template              |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/linux-asahi/files/arm64-dotconfig b/srcpkgs/linux-asahi/files/arm64-dotconfig
index 334de5cb4829f1..79495563dcb386 100755
--- a/srcpkgs/linux-asahi/files/arm64-dotconfig
+++ b/srcpkgs/linux-asahi/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.10 Kernel Configuration
+# Linux/arm64 6.12.12 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -11,7 +11,7 @@ CONFIG_AS_VERSION=24100
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24100
 CONFIG_LLD_VERSION=0
-CONFIG_RUSTC_VERSION=108200
+CONFIG_RUSTC_VERSION=108401
 CONFIG_RUST_IS_AVAILABLE=y
 CONFIG_RUSTC_LLVM_VERSION=190104
 CONFIG_CC_CAN_LINK=y
@@ -19,7 +19,7 @@ CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=128
+CONFIG_PAHOLE_VERSION=129
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -30,7 +30,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
 # CONFIG_WERROR is not set
-CONFIG_LOCALVERSION="+2-asahi_2"
+CONFIG_LOCALVERSION="+1-asahi_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_DEFAULT_INIT=""
@@ -281,7 +281,7 @@ CONFIG_PERF_EVENTS=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_RUST=y
-CONFIG_RUSTC_VERSION_TEXT="rustc 1.82.0 (f6e511eec 2024-10-15) (Void Linux)"
+CONFIG_RUSTC_VERSION_TEXT="rustc 1.84.1 (e71f9a9a9 2025-01-27) (Void Linux)"
 CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.71.1"
 CONFIG_TRACEPOINTS=y
 
diff --git a/srcpkgs/linux-asahi/template b/srcpkgs/linux-asahi/template
index a5f7283a035f31..3596842d72d056 100644
--- a/srcpkgs/linux-asahi/template
+++ b/srcpkgs/linux-asahi/template
@@ -1,13 +1,13 @@
 # Template file for 'linux-asahi'
 pkgname=linux-asahi
-version=6.12.10+2
-revision=2
+version=6.12.12+1
+revision=1
 short_desc="Linux kernel and modules for Apple Silicon"
 maintainer="Will Springer <skirmisher@protonmail.com>, dkwo <npiazza@disroot.org>"
 license="GPL-2.0-only"
 homepage="https://asahilinux.org"
 distfiles="https://github.com/AsahiLinux/linux/archive/asahi-${version/+/-}.tar.gz"
-checksum=86d1742a6e05852f190abb74466a76982af5a59e15b8b273fed8686d46deb7d1
+checksum=a77cbc2ab61ce5c7ed135c7e53a378b426c28a7b2ba4f0d8a83bb1e11fa34433
 
 python_version=3
 

Re: asahi: routine updates

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/54223#issuecomment-2637058080

Comment:
you don't need to ping me on these, I see every PR on irc

Re: [PR REVIEW] asahi: routine updates

[Calandracas606]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New review comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/54223#discussion_r1945921520

Comment:
should add the `install-macsmc-battery` target to install the battery udev rules

Re: [PR REVIEW] asahi: routine updates

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 349 bytes --]

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/54223#discussion_r1946679294

Comment:
See discussion at https://github.com/linrunner/TLP/pull/685
These use systemd and may conflict with tlp, which supports setting battery thresholds for apple silicon just fine, hence I did not include it.

Re: [PR REVIEW] asahi: routine updates

[Calandracas606]

[-- Attachment #1: Type: text/plain, Size: 427 bytes --]

New review comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/54223#discussion_r1947345777

Comment:
Lots of packages exist which can conflict with each other. Though maybe it should be a subpackage then. maybe `asahi-macsmc-battery-udev`

It doesn't need systemd, it has systemd units, but work just fine by reading the configuration file `/etc/udev/macsmc-battery.conf`

Re: [PR PATCH] [Updated] asahi: routine updates

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 446 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages asahi
https://github.com/void-linux/void-packages/pull/54223

asahi: routine updates
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (aarch64-glibc)

[ci skip]
cc @classabbyamp  

A patch file from https://github.com/void-linux/void-packages/pull/54223.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-asahi-54223.patch --]
[-- Type: text/x-diff, Size: 10405 bytes --]

From 8d79964695ee635f309d96a88dfd935efd9b8870 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Wed, 5 Feb 2025 12:16:12 +0100
Subject: [PATCH 1/5] m1n1: update to 1.4.21, add mitigations to hook

---
 srcpkgs/m1n1/files/kernel.d/m1n1.post-install |  2 +-
 srcpkgs/m1n1/files/m1n1.conf                  | 23 -------------------
 srcpkgs/m1n1/template                         | 12 ++++++----
 3 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/m1n1/files/m1n1.conf

diff --git a/srcpkgs/m1n1/files/kernel.d/m1n1.post-install b/srcpkgs/m1n1/files/kernel.d/m1n1.post-install
index ed15e7c23f46bf..0bda2bcf096595 100755
--- a/srcpkgs/m1n1/files/kernel.d/m1n1.post-install
+++ b/srcpkgs/m1n1/files/kernel.d/m1n1.post-install
@@ -22,7 +22,7 @@ if [ -e "$CONFIG" ]; then
 		case "$line" in
 			"") ;;
 			\#*) ;;
-			chosen.*=*|display=*)
+			chosen.*=*|display=*|mitigations=*)
 				echo "$line" >> "$m1n1config"
 				echo "Option: $line"
 				;;
diff --git a/srcpkgs/m1n1/files/m1n1.conf b/srcpkgs/m1n1/files/m1n1.conf
deleted file mode 100644
index 6d847452dc5ec1..00000000000000
--- a/srcpkgs/m1n1/files/m1n1.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# This configuration file specifies options for the m1n1 bootloader.
-#
-# Be careful when editing this file, as incorrect settings can cause your system to fail to boot.
-#
-# Display configuration (Mac Mini / Mac Studio only)
-
-# Force re-configuration of the display to defaults in m1n1 stage 2
-# This is redundant unless your m1n1 stage 1 is buggy or ancient
-#display=auto
-
-# Configure the boot display to the default 4K mode
-#display=3840x2160
-
-# Configure the boot display to 4K at 60Hz (or closest available)
-#display=3840x2160@60
-
-# Configure the boot display to 4K at 59.97Hz (or closest available)
-#display=3840x2160@59.94
-
-# Add an arbitrary property to /chosen in the device tree
-#chosen.foo=bar
-# chosen.bootargs=console=tty0 loglevel=4 root=/dev/nvme0n1p6 rootwait rw
-
diff --git a/srcpkgs/m1n1/template b/srcpkgs/m1n1/template
index 6cc93eeaa0133b..cefcbf09662c2c 100644
--- a/srcpkgs/m1n1/template
+++ b/srcpkgs/m1n1/template
@@ -1,7 +1,7 @@
 # Template file for 'm1n1'
 pkgname=m1n1
-version=1.4.17
-revision=2
+version=1.4.21
+revision=1
 archs="aarch64*"
 hostmakedepends="ImageMagick void-artwork"
 short_desc="Asahi Linux bootloader"
@@ -9,7 +9,7 @@ maintainer="Will Springer <skirmisher@protonmail.com>, dkwo <npiazza@disroot.org
 license="MIT"
 homepage="https://asahilinux.org"
 distfiles="https://github.com/AsahiLinux/m1n1/archive/refs/tags/v${version}.tar.gz"
-checksum=59c960ada35880bf39e033d6cc5ac0079a693a3bb17fb06dfe91e431d2773f96
+checksum=5e0239ff497a8694eaf650d292254aba7d45611f37393053558ee36886db4111
 conf_files="/etc/m1n1.conf /etc/default/m1n1-kernel-hook"
 
 post_extract() {
@@ -29,9 +29,11 @@ do_build() {
 
 do_install() {
 	vinstall build/m1n1.bin 644 usr/lib/asahi-boot
-	vlicense LICENSE
+}
 
-	vinstall ${FILESDIR}/m1n1.conf 644 etc m1n1.conf
+post_install() {
+	vlicense LICENSE
+	vinstall m1n1.conf.example 644 etc m1n1.conf
 	vinstall ${FILESDIR}/m1n1-kernel-hook.confd 644 etc/default m1n1-kernel-hook
 	vinstall ${FILESDIR}/kernel.d/m1n1.post-install 744 etc/kernel.d/post-install 50-m1n1
 }

From 046595245b74ab487a37e2dc9a647c12229d92aa Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Wed, 5 Feb 2025 12:19:32 +0100
Subject: [PATCH 2/5] asahi-scripts: update to 20250130, add udev battery rules
 subpkg

---
 srcpkgs/asahi-macsmc-battery-udev |  1 +
 srcpkgs/asahi-scripts/template    | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/asahi-macsmc-battery-udev

diff --git a/srcpkgs/asahi-macsmc-battery-udev b/srcpkgs/asahi-macsmc-battery-udev
new file mode 120000
index 00000000000000..85e06f4cd37d20
--- /dev/null
+++ b/srcpkgs/asahi-macsmc-battery-udev
@@ -0,0 +1 @@
+asahi-scripts
\ No newline at end of file
diff --git a/srcpkgs/asahi-scripts/template b/srcpkgs/asahi-scripts/template
index fc11affa7611af..ccd50fa25f95bd 100644
--- a/srcpkgs/asahi-scripts/template
+++ b/srcpkgs/asahi-scripts/template
@@ -1,21 +1,28 @@
-# Template file for 'asahi-scripts'.
+# Template file for 'asahi-scripts'
 pkgname=asahi-scripts
-version=20240822
+version=20250130
 revision=1
 archs="aarch64*"
 build_style=gnu-makefile
-make_install_args="install-dracut install-mkinitcpio"
+make_install_args="install-dracut install-mkinitcpio install-macsmc-battery"
 depends="asahi-firmware"
 short_desc="Miscellaneous admin scripts for Apple silicon devices"
 maintainer="dkwo <npiazza@disroot.org>"
 license="MIT"
 homepage="https://github.com/AsahiLinux/asahi-scripts"
 distfiles="https://github.com/AsahiLinux/asahi-scripts/archive/refs/tags/${version}.tar.gz"
-checksum=24023903c1341d6867d9a2baa494bbae90ca27b6cf64fa19218ef87d471304fc
+checksum=a76c64bb971c45454454cdc0668a3f9401f1771c730e78da78bd022c74616c87
 make_dirs="/usr/lib/firmware/vendor 0755 root root"
 
 post_install() {
-	# config for m1n1, provided by that package
-	rm ${DESTDIR}/etc/m1n1.conf
 	vlicense LICENSE
 }
+
+asahi-macsmc-battery-udev_package() {
+	short_desc="Battery udev rules for Apple silicon"
+	conflicts="tlp"
+	pkg_install() {
+		vmove usr/lib/udev/rules.d
+		vmove usr/lib/systemd/system
+	}
+}

From 472fc0f412f6093a8a39fa412b8e976b237b50c2 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Wed, 5 Feb 2025 12:23:07 +0100
Subject: [PATCH 3/5] asahi-base: switch to cp -a in tinyramfs hook

---
 srcpkgs/asahi-base/files/tinyramfs-hook-asahi.init.late | 2 +-
 srcpkgs/asahi-base/template                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/asahi-base/files/tinyramfs-hook-asahi.init.late b/srcpkgs/asahi-base/files/tinyramfs-hook-asahi.init.late
index d8619f6d19a93b..4987578a799ce7 100644
--- a/srcpkgs/asahi-base/files/tinyramfs-hook-asahi.init.late
+++ b/srcpkgs/asahi-base/files/tinyramfs-hook-asahi.init.late
@@ -5,5 +5,5 @@ mkdir -p "$loaderdir"
 mount -t tmpfs -o mode=0755 vendorfw "$loaderdir"
 
 set +f
-cp -pr /vendorfw/* /vendorfw/.vendorfw.manifest "$loaderdir"
+cp -a /vendorfw/* /vendorfw/.vendorfw.manifest "$loaderdir"
 set -f
diff --git a/srcpkgs/asahi-base/template b/srcpkgs/asahi-base/template
index bcab821c28e76c..dddf229785da8c 100644
--- a/srcpkgs/asahi-base/template
+++ b/srcpkgs/asahi-base/template
@@ -1,6 +1,6 @@
 # Template file for 'asahi-base'
 pkgname=asahi-base
-version=20250202
+version=20250205
 revision=1
 archs="aarch64*"
 build_style=meta

From e36aba8f858ab82f96185939594f6403fc2ebe2f Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Wed, 5 Feb 2025 12:49:14 +0100
Subject: [PATCH 4/5] linux-asahi: update to 6.12.12+1

---
 srcpkgs/linux-asahi/files/arm64-dotconfig | 10 +++++-----
 srcpkgs/linux-asahi/template              |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/linux-asahi/files/arm64-dotconfig b/srcpkgs/linux-asahi/files/arm64-dotconfig
index 334de5cb4829f1..79495563dcb386 100755
--- a/srcpkgs/linux-asahi/files/arm64-dotconfig
+++ b/srcpkgs/linux-asahi/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.10 Kernel Configuration
+# Linux/arm64 6.12.12 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -11,7 +11,7 @@ CONFIG_AS_VERSION=24100
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24100
 CONFIG_LLD_VERSION=0
-CONFIG_RUSTC_VERSION=108200
+CONFIG_RUSTC_VERSION=108401
 CONFIG_RUST_IS_AVAILABLE=y
 CONFIG_RUSTC_LLVM_VERSION=190104
 CONFIG_CC_CAN_LINK=y
@@ -19,7 +19,7 @@ CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=128
+CONFIG_PAHOLE_VERSION=129
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -30,7 +30,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
 # CONFIG_WERROR is not set
-CONFIG_LOCALVERSION="+2-asahi_2"
+CONFIG_LOCALVERSION="+1-asahi_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_DEFAULT_INIT=""
@@ -281,7 +281,7 @@ CONFIG_PERF_EVENTS=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_RUST=y
-CONFIG_RUSTC_VERSION_TEXT="rustc 1.82.0 (f6e511eec 2024-10-15) (Void Linux)"
+CONFIG_RUSTC_VERSION_TEXT="rustc 1.84.1 (e71f9a9a9 2025-01-27) (Void Linux)"
 CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.71.1"
 CONFIG_TRACEPOINTS=y
 
diff --git a/srcpkgs/linux-asahi/template b/srcpkgs/linux-asahi/template
index a5f7283a035f31..3596842d72d056 100644
--- a/srcpkgs/linux-asahi/template
+++ b/srcpkgs/linux-asahi/template
@@ -1,13 +1,13 @@
 # Template file for 'linux-asahi'
 pkgname=linux-asahi
-version=6.12.10+2
-revision=2
+version=6.12.12+1
+revision=1
 short_desc="Linux kernel and modules for Apple Silicon"
 maintainer="Will Springer <skirmisher@protonmail.com>, dkwo <npiazza@disroot.org>"
 license="GPL-2.0-only"
 homepage="https://asahilinux.org"
 distfiles="https://github.com/AsahiLinux/linux/archive/asahi-${version/+/-}.tar.gz"
-checksum=86d1742a6e05852f190abb74466a76982af5a59e15b8b273fed8686d46deb7d1
+checksum=a77cbc2ab61ce5c7ed135c7e53a378b426c28a7b2ba4f0d8a83bb1e11fa34433
 
 python_version=3
 

From cc1992681a6750f66b659d981c025c77cecb7c60 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 8 Feb 2025 09:41:40 -0500
Subject: [PATCH 5/5] asahi-audio: update to 2.6

---
 srcpkgs/asahi-audio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/asahi-audio/template b/srcpkgs/asahi-audio/template
index 7d144a35c881c4..bec50555831b4a 100644
--- a/srcpkgs/asahi-audio/template
+++ b/srcpkgs/asahi-audio/template
@@ -1,7 +1,7 @@
 # Template file for 'asahi-audio'
 pkgname=asahi-audio
-version=2.5
-revision=2
+version=2.6
+revision=1
 archs="aarch64*"
 build_style=gnu-makefile
 depends="alsa-ucm-conf-asahi speakersafetyd
@@ -11,7 +11,7 @@ maintainer="dkwo <npiazza@disroot.org>"
 license="MIT"
 homepage="https://github.com/AsahiLinux/asahi-audio"
 distfiles="https://github.com/AsahiLinux/asahi-audio/archive/refs/tags/v${version}.tar.gz"
-checksum=61b014019e0f0172bbe5a9be4a3d8210e77e689bdef411af01bc3a8654d977bc
+checksum=09baf811a2f2ea65684fceb39cf3c1fc2641fc215d4a38a53b9c14d9c2908308
 
 post_install() {
 	vlicense LICENSE

Re: [PR REVIEW] asahi: routine updates

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/54223#discussion_r1947838277

Comment:
You're right, added a subpkg, can you please test it?

Re: asahi: routine updates

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/54223#issuecomment-2645750296

Comment:
Updated audio as well.

Re: [PR REVIEW] asahi: routine updates

[Calandracas606]

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

New review comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/54223#discussion_r1948143073

Comment:
This works for me.

Re: [PR PATCH] [Merged]: asahi: routine updates

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

There's a merged pull request on the void-packages repository

asahi: routine updates
https://github.com/void-linux/void-packages/pull/54223

Description:
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (aarch64-glibc)

[ci skip]
cc @classabbyamp