From owner-svn-src-all@freebsd.org  Fri Jan 24 16:43:02 2020
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 93F1D1F4FAA;
 Fri, 24 Jan 2020 16:43:02 +0000 (UTC)
 (envelope-from kevans@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 4844h63NLWz4FTm;
 Fri, 24 Jan 2020 16:43:02 +0000 (UTC)
 (envelope-from kevans@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 6F5C22A37C;
 Fri, 24 Jan 2020 16:43:02 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00OGh2Af042199;
 Fri, 24 Jan 2020 16:43:02 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00OGh274042198;
 Fri, 24 Jan 2020 16:43:02 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <202001241643.00OGh274042198@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Fri, 24 Jan 2020 16:43:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r357084 - head/secure/caroot
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/secure/caroot
X-SVN-Commit-Revision: 357084
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: Fri, 24 Jan 2020 16:43:02 -0000

Author: kevans
Date: Fri Jan 24 16:43:02 2020
New Revision: 357084
URL: https://svnweb.freebsd.org/changeset/base/357084

Log:
  caroot: use bsd.obj.mk, not bsd.prog.mk
  
  This directory stages certdata into .OBJDIR and processes it, but does not
  actually build a prog-shaped object; bsd.obj.mk provides the minimal support
  that we actually need, an .OBJDIR and descent into subdirs. This is
  admittedly the nittiest of nits.

Modified:
  head/secure/caroot/Makefile

Modified: head/secure/caroot/Makefile
==============================================================================
--- head/secure/caroot/Makefile	Fri Jan 24 16:08:06 2020	(r357083)
+++ head/secure/caroot/Makefile	Fri Jan 24 16:43:02 2020	(r357084)
@@ -7,10 +7,9 @@ CLEANFILES+=	certdata.txt
 SUBDIR+=	trusted
 SUBDIR+=	blacklisted
 
-.include <bsd.prog.mk>
+.include <bsd.obj.mk>
 
 # To be used by secteam@ to update the trusted certificates
-
 fetchcerts: .PHONY
 	fetch --no-sslv3 --no-tlsv1 -o certdata.txt 'https://hg.mozilla.org/projects/nss/raw-file/tip/lib/ckfw/builtins/certdata.txt'