From nobody Tue Dec 21 09:18:12 2021 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 224C818EF6FB; Tue, 21 Dec 2021 09:18:18 +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 4JJ9qC60kVz3tjL; Tue, 21 Dec 2021 09:18:15 +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 A25BB27280; Tue, 21 Dec 2021 09:18:12 +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 1BL9ICfG079819; Tue, 21 Dec 2021 09:18:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BL9IC1E079818; Tue, 21 Dec 2021 09:18:12 GMT (envelope-from git) Date: Tue, 21 Dec 2021 09:18:12 GMT Message-Id: <202112210918.1BL9IC1E079818@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: ec0ea6efa1ad - main - pkgbase: Add a FreeBSD-pkg-bootstrap package 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec0ea6efa1ad229d75c394c1a9b9cac33af2b1d3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640078296; 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=Flsf5azY8cH0WbZW3B9NUb4fvPmzdXlfwU4BdYQwqtw=; b=pap7GPMw+8OTrHSSryK0wvUCxvbOFm831uWK4uPi7kpfe4UDcOEODWPmQRIs6TydGD0XBh MbJkdAytODOR2oqVAMB/nlrup4xNnYul97FX2winaE8NBPz7E1Nk+ktqW2JWTHUtBsh+9F 7c/Qx5ZqMLdgPy1wTP4kcr6jxhJ5Y7RRDc/niD5c2hUaaJFK7l4tH7fGWLYrBav9OEJAp+ 2yvyDAhTUe+WQQ9bJI7Tk4EVlorUnq4VmBX9hBnU5QNhqFYZhwNOnvdx8SIeQI/JZ8RX0I Eu6fPyGpUZ3UO7U4JbVT+TJap0C16Tt6wl4XBZ+GFMNlUqcRQxpcWlhGlwFgJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640078296; a=rsa-sha256; cv=none; b=ji0mLmIvlh/yLqG3r19rX8aldsTJFC71JWk9Vp3vXAk65tvxSMcVfhPwEe7z3TkKMD/nXb rp3WGZLNwL8TZIGeHVr3zgz9Kfain3VRjICwqYvY25rtLuCXqBP2avd4EDz9QrKVGEKpgJ U3OZKAAYmWAcHVA8P5UCQinHHuJVWdVsSU9hmzVKq4YbAcBNfcgkOp3mo/KUYtMr0ZYY1I mhoNocu077IDbiiuj7WZqDAvAXSctIvbsmk1pTvOlg4hKxnVBkdSQ5dFhdz7Z2k0ADeS7S I+EPsm18KKv3S8WXMiC7bRePzB+iyhkJ0ZR5a5ngy2dEP87hxx3sVkw+lHO3BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=ec0ea6efa1ad229d75c394c1a9b9cac33af2b1d3 commit ec0ea6efa1ad229d75c394c1a9b9cac33af2b1d3 Author: Emmanuel Vadot AuthorDate: 2021-12-15 14:19:46 +0000 Commit: Emmanuel Vadot CommitDate: 2021-12-21 09:17:48 +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 --- 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} != ""