From 3926065175bc4fa266575c605cccc634389c1e0a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 27 Aug 2025 14:29:06 +0200
Subject: [PATCH] linux6.16: fix kernel file location

---
 srcpkgs/linux6.16/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/linux6.16/template b/srcpkgs/linux6.16/template
index 9cb1a5a18d6..c1d2240b4b9 100644
--- a/srcpkgs/linux6.16/template
+++ b/srcpkgs/linux6.16/template
@@ -1,7 +1,7 @@
 # Template file for 'linux6.16'
 pkgname=linux6.16
 version=6.16.3
-revision=1
+revision=2
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-only"
@@ -157,28 +157,28 @@ do_install() {
 
 	case "$arch" in
 		x86)
-			vinstall arch/x86/boot/bzImage 644 "usr/lib/modules/${_kernver}" vmlinuz
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
 			;;
 		arm)
-			vinstall arch/arm/boot/zImage 644 "usr/lib/modules/${_kernver}"
+			vinstall arch/arm/boot/zImage 644 boot
 			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
 			;;
 		arm64)
-			vinstall arch/arm64/boot/Image 644 "usr/lib/mdoules/${_kernver}" vmlinux
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
 			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
 			;;
 		powerpc)
 			# zImage on powerpc is useless as it won't load initramfs
 			# raw vmlinux is huge, and this is nostrip, so do it manually
-			vinstall vmlinux 644 "usr/lib/modules/${_kernver}" vmlinux
-			/usr/bin/$STRIP "${DESTDIR}/usr/lib/modules/${_kernver}/vmlinux"
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
 			;;
 		mips)
 			vinstall arch/mips/boot/uImage.bin 644 boot uImage-${_kernver}
 			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
 			;;
 		riscv)
-			vinstall arch/riscv/boot/Image 644 usr/lib/modules/${_kernver}/boot vmlinux
+			vinstall arch/riscv/boot/Image 644 boot vmlinux-${_kernver}
 			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
 			;;
 	esac
@@ -321,7 +321,7 @@ do_install() {
 
 	# Extract debugging symbols and compress modules
 	msg_normal "$pkgver: extracting debug info and compressing modules, please wait...\n"
-	install -Dm644 vmlinux "${DESTDIR}/usr/lib/debug/usr/lib/modules/${_kernver}/vmlinux"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
 	(
 	cd ${DESTDIR}
 	export DESTDIR