From nobody Wed Sep 24 23:24:50 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 4cXCcL4ymkz68bh6; Wed, 24 Sep 2025 23:24:50 +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 4cXCcL4N3vz3T0F; Wed, 24 Sep 2025 23:24:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758756290; 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=1Mt4s7nzrgwu3S74SmD5bLUA0dubDEAQM8ykVjkJB3g=; b=lCfm0J94m9GboN7CSutpyjT39zuqROTOGDnN2ORk8yi32ecQkSEfXVdSw02RCFF8+FGw+c UhDytAc8+6oAK1WLq3LYh1Rt2zMuGkjeObZnY4BzI/h6S572eZgepcU/PrlAeOrjKsOo9/ mLGMs1OIFyVxZv3ncdsMpnCkLhynSOk26VsgLXWtPi92K0/9rBxuHzYQVPkOLxPOfLQ5F+ zfePVNZjmr7AnZYxy5E/Mli0ImE94PTbvqcGUzQcwdAfjPSy2/bdFdAV0iJDYRwFnfBjBH S4Pi68u7d1PEGMkhHg7pq9jj0kC1aYPSXLlJ63Z54nWG/v4mfdgxz42edtLjvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758756290; 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=1Mt4s7nzrgwu3S74SmD5bLUA0dubDEAQM8ykVjkJB3g=; b=VeAzY7J9rfs0OtCyytKRlYOHaWXaCAaMsmPUGk11gOGl4RNMLHOB4ncfq0ICcSzZR/W/Bf v+ZeNFCyxZ2tqvzTsP3xi3rUsqmUdsPqWgDeKw4JqDFanD3n9K162DMgtNMpsMcJbB4OGx 5sLafaDG6beceXV2LiFnx/Ab1ADxBe8dH11qQ7ifea9hRCf1A/DhSTG2y398B+7J9RfpIs gvvFk6p5MOmEYKmr7nZWYb2A1rwPo5fCKLbsvXZqHFZ20wXIYbzECDsVAP6Pw/31BwFuFF KJIcWiHSVlGDkjXK955BNLufxTU41WaELlS6eTGWLAIraT2A21VkcgyZIngv3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758756290; a=rsa-sha256; cv=none; b=crknyBN9mExTh28xIeRn8+qvsKsWL2HuHWRO+dXBq5+akK1KRbOBi3lBpJjsmvkW8zEuY8 r/SmiXjQl9LlryaxFQjmqAWSS6VTWPvYbCzpq1lolXVNgGGtUqXGtR1SXjTKyneKz8XAsg WNyedqFg+KkNe1rH0pWf+PtJqXyDEDT7l9Bt1t6Mxtxh7fpPs2f4pEmuKf8BmKI5PYKMsq t7IjDwlFmUTldhUjqP6kBLH/JsBcCqzE1VtS6gmtKVU7UqImBNTLa3wp7M1acsiNBPJSoK Lzcr5MArQFGsLrpmWk7HrTi/oqRwoNka36NpjSyNPzONM8guxyRoctld4RDZ5Q== 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 4cXCcL3g4vzslZ; Wed, 24 Sep 2025 23:24:50 +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 58ONOoB7001745; Wed, 24 Sep 2025 23:24:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58ONOoYO001742; Wed, 24 Sep 2025 23:24:50 GMT (envelope-from git) Date: Wed, 24 Sep 2025 23:24:50 GMT Message-Id: <202509242324.58ONOoYO001742@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: 56e01d0d7e0f - main - 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/main X-Git-Reftype: branch X-Git-Commit: 56e01d0d7e0f7c2129c05467ca99d5f5538f52bc Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=56e01d0d7e0f7c2129c05467ca99d5f5538f52bc commit 56e01d0d7e0f7c2129c05467ca99d5f5538f52bc Author: Colin Percival AuthorDate: 2025-09-24 23:12:57 +0000 Commit: Colin Percival CommitDate: 2025-09-24 23:24:37 +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 --- 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 }