From nobody Sat Sep 20 04:23:18 2025 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 4cTGT31Ljlz68BRB; Sat, 20 Sep 2025 04:23:19 +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 4cTGT30YfWz3SC9; Sat, 20 Sep 2025 04:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758342199; 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=LXuPqiUeYvueSF43dZ7sTx6aWwWmnxWI262fZmJlzhg=; b=XG8fQbygpHRBl8QmRFXfU37e4a/PC2LXywdxXO8tMyBfa599gTla+AQSlnjG9nel3t258x N7vLledG9IPKL52D1kySTE7av+HLG22j6do/RyN966QGkBCJRk3A9iNjgXf2S/ZOJBhg0o 3gIxlJ7CJaj0QHkFBg/Hirep9fDg+9z5bl3KyjrXCyilkdnCafhvF5302Ucp63q09g/K+S b5V9qF5AjFbhJdFedkzlf7/VWH/tmDMtOIBRS/KbHc/7UTRep4OcmCPqv1NALob+6fMBHA 59v2FidXiGO1wxuCfi6wTycfrYyipFFTgC8WlRl0lkfmlDA0caTGVHSMtKoZeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758342199; 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=LXuPqiUeYvueSF43dZ7sTx6aWwWmnxWI262fZmJlzhg=; b=qR/Aglxh4AZAZbq3fse1ieErOgoAewJA6JMnr6EIKzrKh/y420TbyOWt7z0ZC0QsscYbye H3fuUqJYVsythgJ2lR5Sn1PQrL0siehalAm3Kx/sSmgrymUdx7A01X+gh4DGd8gR07ye95 rTLwWrhOZMRQ7dhBSx50u3Xd8L/v2HdmFEDmXI3wgoAMxYqaHUuqAMYDdebfBi8L0hXmcO Ki6ddPXLsrnhVEbHsuJug4UtdOc47SyXC6E8/DEjFFg8WaTISlueGf4DDAFfXjjl00kkQp 7akj1x08U6PfAbrhq+/zpU2etbxEJJZ5RORcdzAlW1v4olOLi2W+uJof8PaBCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758342199; a=rsa-sha256; cv=none; b=kcTzL4yXXNnAn1tLsYOjzBBJ/Ev7EP0qFgQwy9krdRG3QnqQJGHnQEcrMyA1NczLBMoBpj UNjE+91iscQwAj2tpr4ZeOyS4TUY9UlMUPWfYLamEEwcerg3b3gQWuWcc9o0X3u7zdZaus Paq7HyfPGG2HNtss+L6cM78L5nFca/ARYgTHxT8/1ZB5ACwp958H1dghVf+aIxK1Rr5i+2 LXLq21l8pkA7Ed4/MS5ju34JlKz1Q62xU9G0tUvysQuS4FoLpZONglqVUhY7PDUfhRT2Q3 eTWg+xTvFg7u/zUf+KAby4OernuIZlfvKqcQkPClb3B+9Z4/EZStuXz5CpzEWg== 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 4cTGT261shz1R0S; Sat, 20 Sep 2025 04:23:18 +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 58K4NI8A030035; Sat, 20 Sep 2025 04:23:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58K4NImf030032; Sat, 20 Sep 2025 04:23:18 GMT (envelope-from git) Date: Sat, 20 Sep 2025 04:23:18 GMT Message-Id: <202509200423.58K4NImf030032@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: 08adaf71e2e5 - main - release.sh: Bootstrap pkg from the ports tree 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 08adaf71e2e5a44ea27df0e2b09fbe8279a2523e Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=08adaf71e2e5a44ea27df0e2b09fbe8279a2523e commit 08adaf71e2e5a44ea27df0e2b09fbe8279a2523e Author: Colin Percival AuthorDate: 2025-09-20 04:20:07 +0000 Commit: Colin Percival CommitDate: 2025-09-20 04:23:13 +0000 release.sh: Bootstrap pkg from the ports tree When building OCI continers, we create a pkgbase repository; but we need pkg in order to do this, and it may not be fetchable. Bootstrap it from the ports tree instead. Note that this pkgbase repository is not the same one as we ship as part of the release build; this duplication of package-creation will be fixed at a later date. MFC after: 6 hours Sponsored by: https://www.patreon.com/cperciva --- release/release.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release/release.sh b/release/release.sh index f4786685e612..3934d066420a 100755 --- a/release/release.sh +++ b/release/release.sh @@ -328,7 +328,9 @@ chroot_build_target() { eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel if [ -n "${WITH_OCIIMAGES}" ]; then - eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} packages + mkdir ${CHROOT}/tmp/ports ${CHROOT}/tmp/distfiles + eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} \ + BOOTSTRAP_PKG_FROM_PORTS=YES packages fi return 0