aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2021-12-15 14:19:46 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2021-12-21 09:17:48 +0000
commitec0ea6efa1ad229d75c394c1a9b9cac33af2b1d3 (patch)
tree39aceacde0454a44bee6d8e3f1af2c9305640aa1
parent13ef8134efd1c0a39c2dab0197b5c4558101253e (diff)
downloadsrc-ec0ea6efa1ad229d75c394c1a9b9cac33af2b1d3.tar.gz
src-ec0ea6efa1ad229d75c394c1a9b9cac33af2b1d3.zip
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
-rw-r--r--release/packages/Makefile.package2
-rw-r--r--share/keys/pkg/trusted/Makefile2
-rw-r--r--usr.sbin/pkg/Makefile2
3 files changed, 5 insertions, 1 deletions
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} != ""