git: 2c7441c86ef5 - stable/13 - pkgbase: Add a FreeBSD-pkg-bootstrap package
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 05 Jan 2022 17:24:36 UTC
The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=2c7441c86ef5c970c15047f586372c16ef7c7c3f commit 2c7441c86ef5c970c15047f586372c16ef7c7c3f Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2021-12-15 14:19:46 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2022-01-05 17:23:53 +0000 pkgbase: Add a FreeBSD-pkg-bootstrap package And put pkg and its keys in it. It's easier for small image to depend on this package rather than the larger utilities one. MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33458 (cherry picked from commit ec0ea6efa1ad229d75c394c1a9b9cac33af2b1d3) --- release/packages/Makefile.package | 2 ++ share/keys/pkg/trusted/Makefile | 2 +- usr.sbin/pkg/Makefile | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index fbad12dd56f4..a3739c11fa33 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -87,6 +87,8 @@ nfs_COMMENT= NFS Utilities nfs_DESC= NFS Utilities openssl_COMMENT= OpenSSL Library and Utility openssl_DESC= OpenSSL Library and Utility +pkg-bootstrap_COMMENT= pkg bootstrap Utility +pkg-bootstrap_DESC= pkg bootstrap Utility periodic_COMMENT= Periodic Utility periodic_DESC= Periodic Utility rc_COMMENT= RC Scripts diff --git a/share/keys/pkg/trusted/Makefile b/share/keys/pkg/trusted/Makefile index 2da13d579e82..a2f9d83cc59a 100644 --- a/share/keys/pkg/trusted/Makefile +++ b/share/keys/pkg/trusted/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE= utilities +PACKAGE= pkg-bootstrap FILES= pkg.freebsd.org.2013102301 diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile index dd3db00885b1..29bd6ea5e1af 100644 --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE= pkg-bootstrap + _BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH BRANCH?= ${_BRANCH} .if ${BRANCH:MCURRENT} != ""