From nobody Wed Jan 5 17:24:36 2022 X-Original-To: dev-commits-src-branches@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 D9F3E1921548; Wed, 5 Jan 2022 17:24:42 +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 4JTbvW1bsjz3H4f; Wed, 5 Jan 2022 17:24:39 +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 63DE310983; Wed, 5 Jan 2022 17:24:36 +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 205HOaZs097618; Wed, 5 Jan 2022 17:24:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 205HOaYM097617; Wed, 5 Jan 2022 17:24:36 GMT (envelope-from git) Date: Wed, 5 Jan 2022 17:24:36 GMT Message-Id: <202201051724.205HOaYM097617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 2c7441c86ef5 - stable/13 - pkgbase: Add a FreeBSD-pkg-bootstrap package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2c7441c86ef5c970c15047f586372c16ef7c7c3f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641403479; 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=EZMpEy1nc6wbTh51OSC4SIKXTpLYdHlP5rmoUP2BlQE=; b=rLBtz29Va62/iqGWHKp3gG52zoTYVitWS5HeKNuYJQeV6UCOrbKZNjEzqEBhf50J6rspKp D/UlnwIWo7HBntxRNKI4wDLUBlRnwyPJ5DVa1/E+jZIiWr9G9CYWZy/GoEBQnHG4CRbGVH C+4mOKEHYbCVEolxlv9dhBs/RcnebvOUNF0hy7QWslrlr2WXSL0bMv46VL2/j8/+hejj/N PLuQ52e46Kr32p0nvGxzvk9Udqd+rlfsbqTyQjLM9uclMRywzxgd+ief7/dZJJ2Wm1YDE+ E/Gos33nR3S0tDE85hfMvzoedok15zg5/zm7YUSgiv4TmmW8eetX+fOLu1/xdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641403479; a=rsa-sha256; cv=none; b=dLX0S3GRzLvlVF0GoonRIvRc9Ld8uah7RUCPb0Uz9o0X5VIirgN4NCyehCv62HrPlyDxQE 6jtXewzm4c98lJ6mbGt/3b8g0BWSMAo+rRcKKFLKRxZR7AFB969/x7PbVgyfxinSENLhy4 O22EkSn7CDU2fpsYHyIJS/pvp7H3CJwqCYM6zM7tAcWFn75Q0f7VxxQZ1Uo1NARIuCFHGV xVv78R33uPnUGolUhngU/c0Fi1CeUxzr+6cx2xU7hHNUAj7fZ5b+dkPpJ0z1wRN6AveT8Z mfRNIll5kps3A5MjK/UqzHjxkJlSNQh7OcgiuGDQF0978oRb7wUa1+SfXcms4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=2c7441c86ef5c970c15047f586372c16ef7c7c3f commit 2c7441c86ef5c970c15047f586372c16ef7c7c3f Author: Emmanuel Vadot AuthorDate: 2021-12-15 14:19:46 +0000 Commit: Emmanuel Vadot 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} != ""