git: 32c48d373817 - stable/15 - release: Make toolchain OCI container use pkg set
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 25 Sep 2025 21:08:13 UTC
The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=32c48d37381749021d16db3a4c76202a7eb18456 commit 32c48d37381749021d16db3a4c76202a7eb18456 Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2025-09-24 23:12:57 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> 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 }