Re: [PR PATCH] [Updated] linux-asahi: update to 6.12.10, various fixes

[dkwo <dkwo@users.noreply.github.com>]

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

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

https://github.com/dkwo/void-packages master
https://github.com/void-linux/void-packages/pull/53976

linux-asahi: update to 6.12.10, various fixes
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (aarch64-glibc)

[ci skip]

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

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

From c1e4bb893a2e2cd551b6863b297c1ac0949438bb Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Wed, 15 Jan 2025 15:29:31 +0100
Subject: [PATCH] linux-asahi: fix localversion, edit kconfig, update to
 6.12.10+2

---
 srcpkgs/linux-asahi/files/arm64-dotconfig | 112 ++++++++++++++++++++--
 srcpkgs/linux-asahi/template              |  12 ++-
 2 files changed, 112 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/linux-asahi/files/arm64-dotconfig b/srcpkgs/linux-asahi/files/arm64-dotconfig
index 6d24d5c3823812..06d5a21d81e29f 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.8 Kernel Configuration
+# Linux/arm64 6.12.10 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=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="_1"
+CONFIG_LOCALVERSION="+2-asahi_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_DEFAULT_INIT=""
@@ -2456,6 +2456,7 @@ CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
+# CONFIG_SCSI_SAS_ATA is not set
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
 # end of SCSI Transports
@@ -2476,6 +2477,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC79XX is not set
 # CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_HISI_SAS is not set
 # CONFIG_SCSI_MVSAS is not set
 # CONFIG_SCSI_MVUMI is not set
 # CONFIG_SCSI_ADVANSYS is not set
@@ -2523,7 +2525,100 @@ CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
 # end of SCSI device support
 
-# CONFIG_ATA is not set
+CONFIG_ATA=y
+CONFIG_SATA_HOST=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_FORCE=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_MOBILE_LPM_POLICY=3
+CONFIG_SATA_AHCI_PLATFORM=m
+# CONFIG_AHCI_DWC is not set
+# CONFIG_AHCI_CEVA is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+# CONFIG_SATA_SIL24 is not set
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_DWC is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+
+#
+# PATA SFF controllers with BMDMA
+#
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OF_PLATFORM is not set
+# CONFIG_PATA_RZ1000 is not set
+
+#
+# Generic fallback / legacy drivers
+#
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_LEGACY is not set
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_MD_AUTODETECT=y
@@ -3667,6 +3762,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_CHIPCAP2 is not set
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
 # CONFIG_SENSORS_CORSAIR_PSU is not set
+# CONFIG_SENSORS_DRIVETEMP is not set
 # CONFIG_SENSORS_DS620 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_I5K_AMB is not set
@@ -5969,6 +6065,7 @@ CONFIG_LEDS_USER=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
+# CONFIG_LEDS_TRIGGER_DISK is not set
 CONFIG_LEDS_TRIGGER_MTD=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
@@ -8359,9 +8456,10 @@ CONFIG_STACKTRACE=y
 #
 # RCU Debugging
 #
+CONFIG_TORTURE_TEST=m
 # CONFIG_RCU_SCALE_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_REF_SCALE_TEST is not set
+CONFIG_RCU_TORTURE_TEST=m
+CONFIG_RCU_REF_SCALE_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
 # CONFIG_RCU_CPU_STALL_CPUTIME is not set
@@ -8456,7 +8554,7 @@ CONFIG_IO_STRICT_DEVMEM=y
 #
 CONFIG_PID_IN_CONTEXTIDR=y
 # CONFIG_DEBUG_EFI is not set
-# CONFIG_ARM64_RELOC_TEST is not set
+CONFIG_ARM64_RELOC_TEST=m
 # CONFIG_CORESIGHT is not set
 # end of arm64 Debugging
 
@@ -8483,7 +8581,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_ASYNC_RAID6_TEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
diff --git a/srcpkgs/linux-asahi/template b/srcpkgs/linux-asahi/template
index e1516829dac65f..71e8f0faaca388 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.8+2
+version=6.12.10+2
 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=026e5352d2071569b02601c47c6baa6584ab86095d9da2ecd6c4f1db7187ae44
+checksum=86d1742a6e05852f190abb74466a76982af5a59e15b8b273fed8686d46deb7d1
 
 python_version=3
 
@@ -23,7 +23,7 @@ hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
  pkg-config openssl-devel perl uboot-mkimage cpio pahole python3 zstd
  rust cargo rust-bindgen rust-src libclang"
 
-_kernver=${version%+*}-asahi_${revision}
+_kernver=${version}-asahi_${revision}
 triggers="kernel-hooks"
 kernel_hooks_version="${_kernver}"
 
@@ -53,6 +53,8 @@ post_patch() {
 	# avoid the strip wrapper, its used to copy the objects to a new location
 	# and required to avoid absolute relocations.
 	vsed -e "s|\$(STRIP) \(--strip-debug -o \$@ \$<;\)|/usr/bin/${STRIP} \1|" -i drivers/firmware/efi/libstub/Makefile
+	# use our own local version
+	rm localversion.05-asahi
 }
 
 do_configure() {
@@ -73,7 +75,7 @@ do_configure() {
 	fi
 
 	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"+${version#*+}-asahi_${revision}\"|" .config
 }
 
 do_build() {
@@ -86,7 +88,7 @@ do_build() {
 }
 
 do_install() {
-	local arch _args hdrdest
+	local arch hdrdest
 	arch=arm64
 
 	# Run depmod after compressing modules - makes depmod.sh a noop