git: 4401fa9bf1a3 - main - pkgbase: rename PKGSIGNKEY to PKG_REPO_SIGNING_KEY

[Emmanuel Vadot]

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=4401fa9bf1a3f2a7f2ca04fae9291218e1ca56bf

commit 4401fa9bf1a3f2a7f2ca04fae9291218e1ca56bf
Author:     Emmanuel Vadot <manu at FreeBSD.org>
AuthorDate: 2021-01-04 15:23:10 +0000
Commit:     Emmanuel Vadot <manu at FreeBSD.org>
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ć <me at igalic.co>
    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