kern/51772: Custom kernel names

[yorickhardy%gmail.com@localhost]

>Number:         51772
>Category:       kern
>Synopsis:       Custom kernel names
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kern-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jan 04 08:15:00 +0000 2017
>Originator:     Yorick Hardy
>Release:        NetBSD 7.99.53
>Organization:
 
>Environment:
System: NetBSD HOME 7.99.53 NetBSD 7.99.53 (YORICK.amd64) #0: Sun Jan 1 16:42:47 SAST 2017 root@HOME:/root/build.amd64.local/obj/sys/arch/amd64/compile/YORICK.amd64 amd64
Architecture: x86_64
Machine: amd64
>Description:
Since revision 1.228 of src/sys/conf/Makefile.kern.inc, kernels with a name
other than "netbsd" failed to build.
>How-To-Repeat:
>Fix:
Index: sys/conf/Makefile.kern.inc
===================================================================
RCS file: /cvsroot/src/sys/conf/Makefile.kern.inc,v
retrieving revision 1.250
diff -u -r1.250 Makefile.kern.inc
--- sys/conf/Makefile.kern.inc	9 Apr 2016 18:51:44 -0000	1.250
+++ sys/conf/Makefile.kern.inc	4 Jan 2017 07:59:02 -0000
@@ -213,10 +213,10 @@
 SYSTEM_LD?=	${_MKSHMSG} "   link  ${.CURDIR:T}/${.TARGET}"; \
 		${_MKSHECHO}\
 		${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
-		'$${SYSTEM_OBJ:N*swap*netbsd*}' '$${EXTRA_OBJ}' vers.o \
+		'$${SYSTEM_OBJ:N*swap${.TARGET}*}' '$${EXTRA_OBJ}' vers.o \
 		${OBJS:M*swap${.TARGET}.o}; \
 		${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
-		${SYSTEM_OBJ:N*swap*netbsd*} ${EXTRA_OBJ} vers.o \
+		${SYSTEM_OBJ:N*swap${.TARGET}*} ${EXTRA_OBJ} vers.o \
 		${OBJS:M*swap${.TARGET}.o}
 
 TEXTADDR?=	${LOADADDRESS}			# backwards compatibility