svn commit: r300629 - in stable: 10/sys/conf 8/sys/conf 9/sys/conf

[John Baldwin]

Author: jhb
Date: Tue May 24 23:04:16 2016
New Revision: 300629
URL: https://svnweb.freebsd.org/changeset/base/300629

Log:
  MFC 299310:
  Don't store generated firmware object files in the source directory.
  
  Trim the leading directory of a firmware source file from the resulting
  target object file name so the object file is stored in the object
  directory. Previously, using 'FIRMWS= /path/to/fw.bin:fw.bin' would
  store the generated 'fw.bin.fwo' file in the /path/to directory. Now
  it stores it in the object directory of the kernel module being built.

Modified:
  stable/10/sys/conf/kmod.mk
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/8/sys/conf/kmod.mk
  stable/9/sys/conf/kmod.mk
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/conf/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/conf/   (props changed)

Modified: stable/10/sys/conf/kmod.mk
==============================================================================
--- stable/10/sys/conf/kmod.mk	Tue May 24 21:20:17 2016	(r300628)
+++ stable/10/sys/conf/kmod.mk	Tue May 24 23:04:16 2016	(r300629)
@@ -164,7 +164,7 @@ SRCS+=	${KMOD:S/$/.c/}
 CLEANFILES+=	${KMOD:S/$/.c/}
 
 .for _firmw in ${FIRMWS}
-${_firmw:C/\:.*$/.fwo/}:	${_firmw:C/\:.*$//}
+${_firmw:C/\:.*$/.fwo/:T}:	${_firmw:C/\:.*$//}
 	@${ECHO} ${_firmw:C/\:.*$//} ${.ALLSRC:M*${_firmw:C/\:.*$//}}
 	@if [ -e ${_firmw:C/\:.*$//} ]; then			\
 		${LD} -b binary --no-warn-mismatch ${LDFLAGS}	\
@@ -176,7 +176,7 @@ ${_firmw:C/\:.*$/.fwo/}:	${_firmw:C/\:.*
 		rm ${_firmw:C/\:.*$//};				\
 	fi
 
-OBJS+=	${_firmw:C/\:.*$/.fwo/}
+OBJS+=	${_firmw:C/\:.*$/.fwo/:T}
 .endfor
 .endif