From nobody Thu Sep 25 21:08:13 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 4cXmXF2lkqz68d6D; Thu, 25 Sep 2025 21:08:13 +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 4cXmXF1SYmz4LCn; Thu, 25 Sep 2025 21:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758834493; 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=pbtcjQWDHyGi5DM6vTFDUDzA/OAaKhgtgz5xDnMSTrs=; b=iTe/NH9X816093QY+14zoCrYktzWrBV/KRpX1owH6dBgd+O83V/MbjVaReIKVMcyqlYBDG R68LgQJwMB1krYZUfv2G9YeaYgMhM4iYkSn23JJc/tl57KOatZF1eNOBuNbB/BOmSw/9rD slSxZmMJmfPrQgohwUywx48hFUVWl1HZpfVQvyga6C5iLk/dQJ4IcZvmIuehQVRLIJ+O+V q0mUioclt4nvC3d+BjNQu4PMZEkrH6NwvhydZxqXkuSVq8UNKO58hjwYUulEWToIybg7LO r6DOC3uggZa7HZwS+LmSdM4cBUvYYtq4add2l1oILOXE73yFZ0iqYh/+L0gJTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758834493; 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=pbtcjQWDHyGi5DM6vTFDUDzA/OAaKhgtgz5xDnMSTrs=; b=ip25TjF3ryhHoeJ7mbLG2SCPp9PmbVRfT6VWOmedFfdIC2HrYXSNQG2QRwxCqHs8X9NnT/ BFCxCl9G0BL+apwmGw7lQ7NgfLQ2sVtTYT6epq0zT12UAf7SYO63RjDfQdoEIrR1DMx2td vP71lyGhaamSNZ1PdXnmgEAiVbTzk2Fx54St4EgGGKqaEyzbdf6zC9pNf82W+A98xdzyAU GV0p6oPVqp+v7vPQsdpmtdHfdlgU7HzLnds9TlV2oWE21whADjnQS81J/iYH0EglaQqJXC R87j5Kzh77hp4grvmT5tFN9vU1QDHQoXnbzjsDrXc2LBkeZ8aELtnbRdopLtkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758834493; a=rsa-sha256; cv=none; b=WFD8AKlKesNPoHUQ71y8fJVZXqhQ1ppLOh9ogHh/wkWsNxrzTbce3UZ9psbtf3q4l9fJtT QoLlTDeuNhx5nLVnMEJlx9aU6Hjy8Ns6LRa746zLQaqgtgXeYl/rMhdZIKoEIz/J4GD0Dx vp0KRLxppU8qanVChmzUHJQTBLYKv9cFHN4IkcmJrMUpkrpaEJiAtBAgjki7YILJBnK7Jt qYsNoEB7S916YQQQ9BtdOA2v+GA5bCUVpFzgUlufk4KEnIvSWmI9H+UT0INUcVpdm5IvqP DdMoaYDHVRlMkS5kJSR0/BLkxfi7glY7DCIULdE1PTZsz1EUoKTYV9TIgtdc7Q== 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 4cXmXF0whFz3GT; Thu, 25 Sep 2025 21:08:13 +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 58PL8Dul047841; Thu, 25 Sep 2025 21:08:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58PL8Dq7047838; Thu, 25 Sep 2025 21:08:13 GMT (envelope-from git) Date: Thu, 25 Sep 2025 21:08:13 GMT Message-Id: <202509252108.58PL8Dq7047838@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: 32c48d373817 - stable/15 - release: Make toolchain OCI container use pkg set 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: 32c48d37381749021d16db3a4c76202a7eb18456 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=32c48d37381749021d16db3a4c76202a7eb18456 commit 32c48d37381749021d16db3a4c76202a7eb18456 Author: Colin Percival AuthorDate: 2025-09-24 23:12:57 +0000 Commit: Colin Percival CommitDate: 2025-09-25 21:07:59 +0000 release: Make toolchain OCI container use pkg set This also indirectly addresses the lack of FreeBSD-lldb package on the riscv64 platform by relying on that package being part of the FreeBSD-set-devel set iff it exists. A subsequent commit will adjust the "notoolchain" OCI container image to also use a package set, which will indirectly affect the contents of the "toolchain" container (which is an explicit superset of the "notoolchain" container). MFC after: 1 day Co-authored-by: dch (cherry picked from commit 56e01d0d7e0f7c2129c05467ca99d5f5538f52bc) --- release/tools/oci-image-toolchain.conf | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/release/tools/oci-image-toolchain.conf b/release/tools/oci-image-toolchain.conf index b3b7eed8e8d1..984fb3fbfbfe 100644 --- a/release/tools/oci-image-toolchain.conf +++ b/release/tools/oci-image-toolchain.conf @@ -1,16 +1,11 @@ #! /bin/sh -# Build Open Container Initiative (OCI) container image with almost all of FreeBSD base.txz +# Build OCI container images with almost all packages for running and building FreeBSD. OCI_BASE_IMAGE=notoolchain oci_image_build() { set_cmd ${workdir} /bin/sh install_packages ${abi} ${workdir} \ - FreeBSD-clang \ - FreeBSD-ctf-tools \ - FreeBSD-lld \ - FreeBSD-lldb \ - FreeBSD-toolchain \ - FreeBSD-*-dev + FreeBSD-set-devel }