svn commit: r350664 - head/sys/conf

John Baldwin jhb at FreeBSD.org
Tue Aug 6 23:22:25 UTC 2019


Author: jhb
Date: Tue Aug  6 23:22:25 2019
New Revision: 350664
URL: https://svnweb.freebsd.org/changeset/base/350664

Log:
  Fix LOCAL_MODULES and improve the make output.
  
  The exists() check guarding the invocation of ls was not working
  correctly as it was expanding '$L' to determine the path of the local
  modules directory.  Fix by using {} around the variable name.
  
  Inline some of the logic from bsd.subdir.mk when invoking local module
  builds.  This gives output in 'make buildkernel' the same as if there
  was a Makefile in /usr/local/sys/modules with SUBDIR =
  ${LOCAL_MODULES}.
  
  Reviewed by:	imp
  Differential Revision:	https://reviews.freebsd.org/D20991

Modified:
  head/sys/conf/kern.post.mk

Modified: head/sys/conf/kern.post.mk
==============================================================================
--- head/sys/conf/kern.post.mk	Tue Aug  6 23:15:34 2019	(r350663)
+++ head/sys/conf/kern.post.mk	Tue Aug  6 23:22:25 2019	(r350664)
@@ -61,7 +61,7 @@ LOCAL_MODULES_DIR?= ${LOCALBASE}/sys/modules
 
 # Default to installing all modules installed by ports unless overridden
 # by the user.
-.if !defined(LOCAL_MODULES) && exists($LOCAL_MODULES_DIR)
+.if !defined(LOCAL_MODULES) && exists(${LOCAL_MODULES_DIR})
 LOCAL_MODULES!= ls ${LOCAL_MODULES_DIR}
 .endif
 .endif
@@ -77,7 +77,9 @@ modules-${target}:
 	    ${target:S/^reinstall$/install/:S/^clobber$/cleandir/}
 .endif
 .for module in ${LOCAL_MODULES}
-	cd ${LOCAL_MODULES_DIR}/${module}; ${MKMODULESENV} ${MAKE} \
+	@${ECHODIR} "===> ${module} (${target:S/^reinstall$/install/:S/^clobber$/cleandir/})"
+	@cd ${LOCAL_MODULES_DIR}/${module}; ${MKMODULESENV} ${MAKE} \
+	    DIRPRFX="${module}/" \
 	    ${target:S/^reinstall$/install/:S/^clobber$/cleandir/}
 .endfor
 .endif


More information about the svn-src-all mailing list