From nobody Thu Sep 18 19:25:02 2025 X-Original-To: dev-commits-src-main@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 4cSQZR2Bhqz67tSM; Thu, 18 Sep 2025 19:25:03 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSQZR0d7Fz3GxP; Thu, 18 Sep 2025 19:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758223503; 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=rhPBSpMkGEiE3vTtYjM5zD7VQyZTQfdj+CXiWX5kVcc=; b=xG0r3faSZH8Bfc5nBEWmEjrY9EmM3/hFKhWBmA82BPGDLilomD+nHwndVsUdqtVNh+/6kY exnekNOkY9/kVs0tKXY/HVa6UF/VoqI/bfBkI1yp7kPs4iQ/inDqFlz9ki0IlZwcVMwjfS zZIzIsl0elqJLDIkcGQ/qQXMVDBlKhxBxcYmQ1b75RWxrWQ+rme2BHSDWe8dZOPdIDRsH7 w4lQ4JfMxwEMJ01zZ2pQUMcYQTWNeKXYLRFXkT4ISzors0XQRMn5MN1Aqt8WeGlyvij0XL 9JweMwE9hRfVx2zamwTr/C3rdjinZYPuBKpUde1UgfMGstNUE++tq49/DDAzIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758223503; 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=rhPBSpMkGEiE3vTtYjM5zD7VQyZTQfdj+CXiWX5kVcc=; b=X9BoqtxAvAzCajwAltnS5KR8dfdUCL9OQWLcoP4y9IT5m50E0+Nu5QVgo3VmgdVtNkUBIv Je03BHIFy2h7oHXaYvxGUWOMtjgtKw1f8qNJSyK03Dm/4zlh6INUsmOMsP8KpYzbfv8L/b ghC/BiUgW64jtnLf4CVpxkE9u86Qo1YOyqLXi/iCgVSgp2b7wQjqqyzYT5onXnZ9JWTOgu VtVxroTmDRDm9/cghIK8zL70DrQ4SUeQiN4R47dPqL99ZLy8MCkoAp52xkWmpfclEb0VYF aOYy4kPsOc0xuwTyTbdPyrgsUij4cpwd1YIEg6Ky9o3LNyNitGvDRCUUgXt8Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758223503; a=rsa-sha256; cv=none; b=NFMelCWekUXcaSbuxOGOnZjAjneBABW6VU0mVzjT7Tflov95xyBOtrb1iAk3BcDUvOpxI/ +PFPItOPcSjTy+Zb8xf4qaJc0cgA15OHbyUfT4N8QhI7iF+qv76hKGoQd+XOSULbDmJ/QZ s4UERnNSdJHBSgNtrCxpzwIv42QzrRYvADYetPHySB7pq+iAfqPX9HgbqQEwOnUuRP8qm5 Xmax8PgmyG2bsFWLSCX/Hr4GdJ9ser1P1WHQnJp8Eh1x2kyG53ANk2g1B5jJNaJ3zwPHxa SGaES4K4XtmrGG1JAXOLzc4a/WjTGpSm82OY7dJZsIhQM+MVsKPZATCj/bcBjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSQZR09qrz7tr; Thu, 18 Sep 2025 19:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58IJP233007200; Thu, 18 Sep 2025 19:25:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58IJP2P1007197; Thu, 18 Sep 2025 19:25:02 GMT (envelope-from git) Date: Thu, 18 Sep 2025 19:25:02 GMT Message-Id: <202509181925.58IJP2P1007197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 2c06b824436d - main - pkgbootstrap: Build pkg if PORTSDIR exists List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c06b824436df6177545cc0f1603e5c3bfbf3365 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2c06b824436df6177545cc0f1603e5c3bfbf3365 commit 2c06b824436df6177545cc0f1603e5c3bfbf3365 Author: Colin Percival AuthorDate: 2025-09-18 19:21:29 +0000 Commit: Colin Percival CommitDate: 2025-09-18 19:21:29 +0000 pkgbootstrap: Build pkg if PORTSDIR exists If we don't already have the pkg tool installed, we need to install it before we can build packages for pkgbase. (This arises in release builds which run in clean chroots; most users will have pkg installed already.) Installing it from pkg.freebsd.org via "pkg bootstrap" runs into two problems: First, it's an external dependency with security implications; and second, there's a bootstrapping problem on new major versions where pkg.freebsd.org does not have packages yet. Instead, if we have a ports tree, use it to build pkg ourselves. With hat: re MFC after: 6 hours Sponsored by: https://www.patreon.com/cperciva --- Makefile.inc1 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index cd0385ea32ac..d41741d15384 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1992,8 +1992,16 @@ PKG_ABI!= ${PKG_CMD} -o ABI_FILE=${PKG_ABI_FILE} config ABI _pkgbootstrap: .PHONY .if make(*package*) && !exists(${LOCALBASE}/sbin/pkg) +.if exists(${PORTSDIR}/ports-mgmt/pkg/Makefile) + env - UNAME_r=${UNAME_r} PATH=$$PATH \ + make -C ${PORTSDIR}/ports-mgmt/pkg \ + I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=1 \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean +.else @env ASSUME_ALWAYS_YES=YES pkg bootstrap .endif +.endif PKG_BIN_VERSION!=${PKG_CMD} --version /dev/null |\ awk -F. '/^[0-9.]+$$/ {print $$1 * 10000 + $$2 * 100 + $$3}'