From nobody Sat Apr 15 00:29:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyvMg4V6fz457pt; Sat, 15 Apr 2023 00:29:35 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PyvMg3n9Wz49bd; Sat, 15 Apr 2023 00:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681518575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1RyBi+uf0YBb4GjpnsJl3tc/KMTYiXttopIg+TeFpmc=; b=et6LUO2wGycltlZAxMn4T9rwNVZE61k9vLx1NPDHWaAy2mIAv/cWxjTQ31oDb8amU0PZZo Ke2g400pgKixk64ZSWCC4dSx783mt3hvR3OZ1AzSoVPHDExgh1XSIwghXyalhcGyPEGVr2 W8awvj87VvM7cxL7AHmrEm0/0nxSh7J6fBK0izJuoDHMy0M2Md/csKvUrfAacKtl/vtfXs JkKHU5/GWw3+MzuN1BMcM1BE/vAdYxDWAGHk1miw4H+Vv37YnzAxem4x5t4bze0pBtQFWd vIKYKDZTnejgvnaPaowMPSKnPwitxRcE5V+C/74EuOr72gh094MJUB4kuxwNOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681518575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1RyBi+uf0YBb4GjpnsJl3tc/KMTYiXttopIg+TeFpmc=; b=P3/IkJTC3YU8HDkslVW0eYcChXynd5CVwXYLEntHexxeroKv5v9uz+mfxvMKnHVLGdPljO JBUVfSs6ZS02aaZwI5l3zxEK3aqzVvQ4IYfZybHAMLSQzsWXmL4ejd81Ls4O9JMAmk8Mvg TotT7IWmrA3tmZz18ugmAZrtAdkrKoz5cBV6bvyZ+it8Mvu8o1xJnGzHh3mAH+Ev2H0mzn lEdMhBcneX9ZOBDDQHeUTqr5Klf+60APQ87WbmO1i5PR4lIZ+25Q05r96G+mxTdsdSw1vH 6hASEqCRTH4+nnd1sGBMYzc5f7YhNWS/e8dV/qbeQ7DXOxOXCqhNGV81Ou9UQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681518575; a=rsa-sha256; cv=none; b=Lz2xi7HwS1kDVsTk5HcES+F9966EMMR7RvAxaPHU9miUZM0e0yDwxuXTK6M0SZLJFqmomf QDujk3Yb8vKxRM3z1dZttACNJkVFNLtVyRaUjoRSQ7wuwSDp3D7tlgOEu2Ol7WKNNEzFin p7MdS1pYxvuf9nWBTiGk3XyUf/MkgL92aTQrI6b+2MtE3WqLdEIOS+d+6oLhCkmZwPU8Yo cZXsXwHF7PJPSWTUQsDhhooWPKCESH3zoEhe9hdLb02GIkGCoCPUAczUXVz6HkifU8PZR6 SxXwuPwaesEcDTpT73boJRK5t3e8Ktx8rctBfx6raXIk4JXNz6LAoOSEC22oyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PyvMg2s1dzlkG; Sat, 15 Apr 2023 00:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33F0TZOi013132; Sat, 15 Apr 2023 00:29:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33F0TZjW013131; Sat, 15 Apr 2023 00:29:35 GMT (envelope-from git) Date: Sat, 15 Apr 2023 00:29:35 GMT Message-Id: <202304150029.33F0TZjW013131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: d1dfe419acc0 - main - libsecureboot allow site.trust.mk to override settings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1dfe419acc06d9239f324a219ee9df36dbed817 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=d1dfe419acc06d9239f324a219ee9df36dbed817 commit d1dfe419acc06d9239f324a219ee9df36dbed817 Author: Simon J. Gerraty AuthorDate: 2023-04-15 00:28:10 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-15 00:28:10 +0000 libsecureboot allow site.trust.mk to override settings The current content of local.trust.mk is mostly for example purposes. --- lib/libsecureboot/local.trust.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libsecureboot/local.trust.mk b/lib/libsecureboot/local.trust.mk index b28e5ee2d1ef..cc88528ba707 100644 --- a/lib/libsecureboot/local.trust.mk +++ b/lib/libsecureboot/local.trust.mk @@ -37,6 +37,9 @@ VE_SIGNATURE_EXT_LIST+= \ VE_SIGNATURE_LIST+= OPENPGP VE_SIGNATURE_EXT_LIST+= asc +# allow site override of all the above +.-include "site.trust.mk" + SIGNER ?= ${SB_TOOLS_PATH:U/volume/buildtools/bin}/sign.py .if exists(${SIGNER}) @@ -109,7 +112,7 @@ ta.h: vc_rsa.pem TRUST_ANCHORS!= cd ${.CURDIR} && 'ls' -1 *.pem t*.asc 2> /dev/null .endif .if empty(TRUST_ANCHORS) && ${MK_LOADER_EFI_SECUREBOOT} != "yes" -.error Need TRUST_ANCHORS see ${.CURDIR}/README.rst +.error Need TRUST_ANCHORS see ${.PARSEDIR}/README.rst .endif .if ${TRUST_ANCHORS:T:Mt*.pem} != "" ta.h: ${TRUST_ANCHORS:M*.pem}