Upgrade templates

linux-clang/linux6.15-zen/template

@@ -174,7 +174,7 @@ do_install() {
 	# Remove firmware stuff provided by the "linux-firmware" pkg.
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
-	for i in acpi asm-generic clocksource config crypto drm generated linux vdso \
+	for i in acpi asm-generic clocksource config crypto drm generated hyperv linux vdso \
 		math-emu media net pcmcia scsi sound trace uapi video xen dt-bindings; do
 		if [ -d include/$i ]; then
 			cp -a include/$i ${hdrdest}/include
@@ -215,44 +215,18 @@ do_install() {
 		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
 	fi
 
-	# add headers for lirc package
+	# Copy essential driver headers needed for external modules
-	# pci
+	mkdir -p ${hdrdest}/drivers
-	for i in bt8xx cx88 saa7134; do
+	cp -a drivers/md ${hdrdest}/drivers/ 2>/dev/null || true
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+	cp -a drivers/media ${hdrdest}/drivers/ 2>/dev/null || true
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done	
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
 	
-	mkdir -p ${hdrdest}/drivers/md
+	# Copy networking headers
-	cp drivers/md/*.h ${hdrdest}/drivers/md
+	mkdir -p ${hdrdest}/net
+	cp -a net/mac80211 ${hdrdest}/net/ 2>/dev/null || true
 	
-	mkdir -p ${hdrdest}/include/linux
+	# Copy filesystem headers for external filesystems (e.g., aufs)
-	cp include/linux/inotify.h ${hdrdest}/include/linux
+	mkdir -p ${hdrdest}/fs
-
+	cp -a fs/xfs ${hdrdest}/fs/ 2>/dev/null || true
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
 
 	# Add objtool binary, needed to build external modules with dkms
 	case "$XBPS_TARGET_MACHINE" in

linux-gcc/linux6.15-zen/template

@@ -148,6 +148,7 @@ do_install() {
 			;;
 	esac
 
+	# Switch to /usr.
 	vmkdir usr
 	mv ${DESTDIR}/lib ${DESTDIR}/usr
 
@@ -172,7 +173,7 @@ do_install() {
 	# Remove firmware stuff provided by the "linux-firmware" pkg.
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
-	for i in acpi asm-generic clocksource config crypto drm generated linux vdso \
+	for i in acpi asm-generic clocksource config crypto drm generated hyperv linux vdso \
 		math-emu media net pcmcia scsi sound trace uapi video xen dt-bindings; do
 		if [ -d include/$i ]; then
 			cp -a include/$i ${hdrdest}/include
@@ -213,50 +214,18 @@ do_install() {
 		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
 	fi
 
-	# add headers for lirc package
+	# Copy essential driver headers needed for external modules
-	# pci
+	mkdir -p ${hdrdest}/drivers
-	for i in bt8xx cx88 saa7134; do
+	cp -a drivers/md ${hdrdest}/drivers/ 2>/dev/null || true
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+	cp -a drivers/media ${hdrdest}/drivers/ 2>/dev/null || true
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done	
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
 	
-	# Add md headers
+	# Copy networking headers
-	mkdir -p ${hdrdest}/drivers/md
+	mkdir -p ${hdrdest}/net
-	cp drivers/md/*.h ${hdrdest}/drivers/md
+	cp -a net/mac80211 ${hdrdest}/net/ 2>/dev/null || true
 	
-	# Add inotify.h
+	# Copy filesystem headers for external filesystems (e.g., aufs)
-	mkdir -p ${hdrdest}/include/linux
+	mkdir -p ${hdrdest}/fs
-	cp include/linux/inotify.h ${hdrdest}/include/linux
+	cp -a fs/xfs ${hdrdest}/fs/ 2>/dev/null || true
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
 
 	# Add objtool binary, needed to build external modules with dkms
 	case "$XBPS_TARGET_MACHINE" in
@@ -301,7 +270,7 @@ linux6.15-zen-headers_package() {
 		vmove usr/lib/modules/${_kernver}/build
 	}
 }
-linux6.15zen-dbg_package() {
+linux6.15-zen-dbg_package() {
 	preserve=yes
 	nostrip=yes
 	noverifyrdeps=yes