Date: Mon, 21 Jul 2025 12:49:06 GMT From: Doug Rabson <dfr@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 2e2903faa6ec - main - release: Generalise the OCI image build's pkg config Message-ID: <202507211249.56LCn6bN008465@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=2e2903faa6ec3e85a0923661f307a163fe66b086 commit 2e2903faa6ec3e85a0923661f307a163fe66b086 Author: Doug Rabson <dfr@FreeBSD.org> AuthorDate: 2025-05-28 13:31:25 +0000 Commit: Doug Rabson <dfr@FreeBSD.org> CommitDate: 2025-07-21 12:43:21 +0000 release: Generalise the OCI image build's pkg config Allow building OCI images if the source tree is not /usr/src. This also removes the copy of /etc/pkg/FreeBSD.conf which is not needed for the OCI image build. MFC after: 3 days --- release/scripts/make-oci-image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/scripts/make-oci-image.sh b/release/scripts/make-oci-image.sh index cc599c76bd51..8a620e9d8973 100644 --- a/release/scripts/make-oci-image.sh +++ b/release/scripts/make-oci-image.sh @@ -22,16 +22,16 @@ echo "Building OCI freebsd${major}-${image} image for ${abi}" init_repo() { local workdir=$1; shift local abi=$1; shift + local srcdir=$(realpath ${curdir}/..) mkdir -p ${workdir}/repos cat > ${workdir}/repos/base.conf <<EOF FreeBSD-base: { - url: "file:///usr/obj/usr/src/repo/${abi}/latest" + url: "file:///usr/obj${srcdir}/repo/${abi}/latest" signature_type: "none" fingerprints: "none" } EOF - cp /etc/pkg/FreeBSD.conf ${workdir}/repos } # Install packages using pkg(8) into a container with rootfs at $3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202507211249.56LCn6bN008465>