From owner-dev-commits-src-all@freebsd.org Mon Jan 4 15:25:22 2021 Return-Path: Delivered-To: dev-commits-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 B1E604D8CC7; Mon, 4 Jan 2021 15:25:22 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8fZp3Rryz4rLy; Mon, 4 Jan 2021 15:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 650231C34D; Mon, 4 Jan 2021 15:25:22 +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 104FPMRc059107; Mon, 4 Jan 2021 15:25:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 104FPMVK059106; Mon, 4 Jan 2021 15:25:22 GMT (envelope-from git) Date: Mon, 4 Jan 2021 15:25:22 GMT Message-Id: <202101041525.104FPMVK059106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 4401fa9bf1a3 - main - pkgbase: rename PKGSIGNKEY to PKG_REPO_SIGNING_KEY MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4401fa9bf1a3f2a7f2ca04fae9291218e1ca56bf Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 15:25:22 -0000 The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4401fa9bf1a3f2a7f2ca04fae9291218e1ca56bf commit 4401fa9bf1a3f2a7f2ca04fae9291218e1ca56bf Author: Emmanuel Vadot AuthorDate: 2021-01-04 15:23:10 +0000 Commit: Emmanuel Vadot CommitDate: 2021-01-04 15:24:14 +0000 pkgbase: rename PKGSIGNKEY to PKG_REPO_SIGNING_KEY this way, it'll be automatically picked up by poudriere That's quite handy when building pkgbase! Submitted by: Mina Galić Reviewed By: bapt, bcr (manpages) Differential Revision: https://reviews.freebsd.org/D27690 --- Makefile.inc1 | 4 ++-- share/man/man5/make.conf.5 | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 6ca69da0f0bc..fecdc1bdca71 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1851,7 +1851,7 @@ WSTAGEDIR?= ${OBJTOP}/worldstage KSTAGEDIR?= ${OBJTOP}/kernelstage REPODIR?= ${OBJROOT}repo PKG_FORMAT?= txz -PKGSIGNKEY?= # empty +PKG_REPO_SIGNING_KEY?= # empty PKG_OUTPUT_DIR?= ${PKG_VERSION} .ORDER: stage-packages create-packages @@ -2064,7 +2064,7 @@ sign-packages: _pkgbootstrap .PHONY -m ${WSTAGEDIR}/meta \ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ - ${PKGSIGNKEY} ; \ + ${PKG_REPO_SIGNING_KEY} ; \ cd ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI); \ ln -s ${PKG_OUTPUT_DIR} latest diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 7cb28c865151..3dffdf7b402c 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 27, 2018 +.Dd December 20, 2020 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -444,6 +444,16 @@ statically linked, this can be bad. If set, every utility that uses .Pa bsd.prog.mk will be linked statically. +.It Va PKG_REPO_SIGNING_KEY +.Pq Vt str +Path to rsa private key passed to +.Xr pkg-repo 8 +to sign packages created when building the +.Ar packages +target, i.e.: pkgbase. +The variable is named the same in +.Xr poudriere 8 +so it will automatically be picked up when building pkgbase with poudriere. .It Va PPP_NO_NAT .Pq Vt bool Build