svn commit: r354048 - stable/12/sys/conf

[John Baldwin]

Author: jhb
Date: Thu Oct 24 21:02:24 2019
New Revision: 354048
URL: https://svnweb.freebsd.org/changeset/base/354048

Log:
  MFC 351434: Fix universe to include arm LINT kernel configs.
  
  Strip comments from the NOTES.armv[57] files as is done for other
  NOTES files when building the corresponding LINT configs.  Without
  this, the LINT configs contained the NO_UNIVERSE comment from the
  NOTES.armv[57] files.

Modified:
  stable/12/sys/conf/makeLINT.mk
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/conf/makeLINT.mk
==============================================================================
--- stable/12/sys/conf/makeLINT.mk	Thu Oct 24 20:48:30 2019	(r354047)
+++ stable/12/sys/conf/makeLINT.mk	Thu Oct 24 21:02:24 2019	(r354048)
@@ -51,8 +51,10 @@ LINT: ${NOTES} ${MAKELINT_SED}
 	echo "nodevice netmap"		>> ${.TARGET}-NOIP
 .endif
 .if ${TARGET} == "arm"
-	cat ${.TARGET} ${.CURDIR}/NOTES.armv5 > ${.TARGET}-V5
-	cat ${.TARGET} ${.CURDIR}/NOTES.armv7 > ${.TARGET}-V7
+	cat ${NOTES} ${.CURDIR}/NOTES.armv5 | sed -E -n -f ${MAKELINT_SED} > \
+	    ${.TARGET}-V5
+	cat ${NOTES} ${.CURDIR}/NOTES.armv7 | sed -E -n -f ${MAKELINT_SED} > \
+	    ${.TARGET}-V7
 	rm ${.TARGET}
 .endif
 .if ${TARGET} == "mips"