From 3c6141f6f36b631904a0f70808143ddf36307073 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sat, 18 May 2024 02:03:17 +0000
Subject: [PATCH] include all extra flavors of the kernel and use the proper
 variable for the machine dependent installation directory.

---
 distrib/common/bootimage/Makefile.bootimage | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/distrib/common/bootimage/Makefile.bootimage b/distrib/common/bootimage/Makefile.bootimage
index 7e8e19c19d86..e59114ab5555 100644
--- a/distrib/common/bootimage/Makefile.bootimage
+++ b/distrib/common/bootimage/Makefile.bootimage
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootimage,v 1.36 2024/05/16 15:46:42 christos Exp $
+#	$NetBSD: Makefile.bootimage,v 1.37 2024/05/18 02:03:17 christos Exp $
 #
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
 #
@@ -433,12 +433,13 @@ ${TARGETFS}: prepare_md_post ${WORKFSTAB}
 .if defined(SPEC_EXTRA)
 	cat ${SPEC_EXTRA} >> ${WORKSPEC}
 .endif
-	if [ -f ${WORKDIR}/netbsd.gdb ]; then \
-	    echo "./netbsd.gdb type=file uname=root gname=wheel mode=0444" \
-	    >> ${WORKSPEC}; \
-	fi
-	if [ -d ${WORKDIR}/${MACHINE} ]; then \
-	    ${MAKESPEC} -d ${WORKDIR} ${MACHINE} >> ${WORKSPEC}; \
+	for i in ${WORKDIR}/netbsd.*; do \
+	    if [ -e $$i ]; then \
+		echo "./$$(basename $$i) type=file uname=root gname=wheel mode=0444" >> ${WORKSPEC}; \
+	    fi; \
+	done
+	if [ -d ${WORKDIR}/${RELEASEMACHINEDIR} ]; then \
+	    ${MAKESPEC} -d ${WORKDIR} ${RELEASEMACHINEDIR} >> ${WORKSPEC}; \
 	fi
 	@echo Creating rootfs...
 	# XXX /var/spool/ftp/hidden is unreadable