From owner-svn-src-head@freebsd.org  Wed Feb 19 02:35:45 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 24F8624CAB0;
 Wed, 19 Feb 2020 02:35:45 +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 48MhfS6rllz4GSd;
 Wed, 19 Feb 2020 02:35:44 +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 6C5E51D69;
 Wed, 19 Feb 2020 02:35:44 +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 01J2ZiGS057647;
 Wed, 19 Feb 2020 02:35:44 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01J2ZiTB057646;
 Wed, 19 Feb 2020 02:35:44 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <202002190235.01J2ZiTB057646@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: Wed, 19 Feb 2020 02:35:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r358092 - head/release/packages
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/release/packages
X-SVN-Commit-Revision: 358092
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Feb 2020 02:35:45 -0000

Author: kevans
Date: Wed Feb 19 02:35:43 2020
New Revision: 358092
URL: https://svnweb.freebsd.org/changeset/base/358092

Log:
  caroot pkg: pass through the pkg -r rootdir as DESTDIR
  
  If we're trying to bootstrap a different root with pkgbase, we should be
  doing the right thing with caroot.

Modified:
  head/release/packages/caroot.ucl

Modified: head/release/packages/caroot.ucl
==============================================================================
--- head/release/packages/caroot.ucl	Wed Feb 19 02:34:56 2020	(r358091)
+++ head/release/packages/caroot.ucl	Wed Feb 19 02:35:43 2020	(r358092)
@@ -20,6 +20,7 @@ scripts: {
 	# files being added or removed, we should use it instead to gate the
 	# rehash.
 	post-install = <<EOD
-	[ -x /usr/sbin/certctl ] && /usr/sbin/certctl rehash
+	[ -x /usr/sbin/certctl ] && env DESTDIR=${PKG_ROOTDIR} \
+	    /usr/sbin/certctl rehash
 EOD
 }