From nobody Sat Sep 20 23:28:09 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 4cTlt15h6dz68Z5w; Sat, 20 Sep 2025 23:28:09 +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 4cTlt12ybZz3gYb; Sat, 20 Sep 2025 23:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758410889; 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=oRHx/4s+4qB8kmQipH2fyvJ5NAMvqTX9jI1cZEdNGvM=; b=h7mm0mlMOrdXQDqpMi3gIHsU13uY3wbT0Uiq/lOiW1fmHRDuSZaka5iWojeeYLErDLjsuk aKvuxdFy6L9UZqPWcGNgujuf74B3TWKUc13ysg4QXucphDE/I0ey866d+ZP0drHQ8E8tpZ cIoG03CFux99Um4CIhbtU7bfZeZnhSZsYfwJl3o4sCfq2ab+F/nTiLdQVnsPfFaBu9rE7b a5+XlggXR7TZQgCpwfs1Nj0sIao4KjGZs3nSzN1BAPddfoU0vUgfTh0SEYMvoLuwaY/XJz yIQQfGqW5Ivt6orJT0oJZ58L5FS5Duu2bKwZ76aXmPcgyrvEfpQ8I2bg0GA2Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758410889; 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=oRHx/4s+4qB8kmQipH2fyvJ5NAMvqTX9jI1cZEdNGvM=; b=cDeYIkCvvJLKIS+tm1kQC1A2bF8Izx1Ti3/lrI5zLYG2E6K/zFYHBgnef3w0kNd5xunRbD UGmx79pRZKLPuh4+MtrhK5/oz6aGn+3bNiMpmzsmauMIvxQAWSG5vuqWGsi1TZmEVEBRAQ esSYO3OvGpdcILNMKdWVQvlR0/DIBAb94HUtOs3jiAEbqplq0eyQDPjxKSA93JxVX6gN2A h/Nk2VpsyWwDdWHafTKmAEndMSbF5gJLXNJSjqkfgAVBKR8LjPS3j4PhsDRMg7L1zuEpJU f1GJf/8p2SBKQiRabWDGAP+ETiu1qDs7h9enyOKPQwMkXQWxSdzN6KTe8XSQ1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758410889; a=rsa-sha256; cv=none; b=E0oRub5uOzoU6iGuWgzAOQ5oYN5LBTOxXyybOY8YzSSpi9ePmSSy4n6jyrYmFN7LA5LLgw GsEiB/VNBp08XuvBmeOa5fUbwxLIyyZN7up4SGH/afQYwUasor8eYi4dSgeHNFDLkUaRQK FLJgUmWmmsnPOa1ROhs60oFBoa5ZCSEwkE6B8CFleokj7C6J43FFvTmL66S3iqEO7Fd9uz dTtR5zAzPYjAHTX/J2CofXM64rHjo5oEhgF0lfMyvmeauBA2pXatF/22WtbU4h6bJGoQCA mOHbs+/5xK+tjzcd0MmVnQqKn6UpItx4NkF6hv7OHhJ+TyaZFqHhnYGBbdkO+A== 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 4cTlt12LtWzpqn; Sat, 20 Sep 2025 23:28:09 +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 58KNS9h8073161; Sat, 20 Sep 2025 23:28:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58KNS9Gk073158; Sat, 20 Sep 2025 23:28:09 GMT (envelope-from git) Date: Sat, 20 Sep 2025 23:28:09 GMT Message-Id: <202509202328.58KNS9Gk073158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c2e6178e6802 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: c2e6178e6802f70396f021adcf67be4434807d5c Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c2e6178e6802f70396f021adcf67be4434807d5c commit c2e6178e6802f70396f021adcf67be4434807d5c Author: Colin Percival AuthorDate: 2025-09-20 04:20:07 +0000 Commit: Colin Percival CommitDate: 2025-09-20 13:51:07 +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 (cherry picked from commit 08adaf71e2e5a44ea27df0e2b09fbe8279a2523e) --- 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