From owner-svn-src-all@freebsd.org  Thu Oct 24 21:02:25 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4AB4715A58C;
 Thu, 24 Oct 2019 21:02:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46zfns1DpBz4ccc;
 Thu, 24 Oct 2019 21:02:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0DA351C12D;
 Thu, 24 Oct 2019 21:02:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9OL2O48072799;
 Thu, 24 Oct 2019 21:02:24 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9OL2Ovs072798;
 Thu, 24 Oct 2019 21:02:24 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201910242102.x9OL2Ovs072798@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 24 Oct 2019 21:02:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r354048 - stable/12/sys/conf
X-SVN-Group: stable-12
X-SVN-Commit-Author: jhb
X-SVN-Commit-Paths: stable/12/sys/conf
X-SVN-Commit-Revision: 354048
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Oct 2019 21:02:25 -0000

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"