From nobody Mon Jul 21 12:49:06 2025 X-Original-To: dev-commits-src-main@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 4bm0Zp6vcCz62cBP; Mon, 21 Jul 2025 12:49:06 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bm0Zp61X2z45Vm; Mon, 21 Jul 2025 12:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753102146; 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=MOkYlD3fFzngluXCtcgXwJ2Wd5xtVmPsQxGpyGeezNg=; b=bKhOWwR5t2FTjE8BHnGkRGNNPec2y/rnNNc3QwYqX3iikJiiebOzCpSuOhtF0U1ajqMKGR gwol+tjp9qVB/HpIMIh8hZeaBE7Q8ZGAfbG/zJeIlw9vtRZUAk2SQIwyUFkD6CltUWysjk Ytorg13tdL//2OZPIpmf2ftl5jdj362q/X3XOW121f2HKhyocb4yH4KcsiFsMFY2d0wonH 5aBlxPJgwi2zpoLx29lYnxZ8C467RAzn6oBkrBZTj4VfYRD7LJxbCDIwKYRs8QnVlbi7jH 8wk2N80JtmC/5fCwBk06aFHxVSqMPlh09me4EymdK4moZHdJu/j9n2yHKPMtkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753102146; 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=MOkYlD3fFzngluXCtcgXwJ2Wd5xtVmPsQxGpyGeezNg=; b=tnjVBDIp9VF+KmWB5IB5q15vWhIDIdl7Pfch9uS7JM+1UNikKHlekiOa1HKZ3k97LLN18k Eajqstqupaqapo03Ay1g8hb49OC+XvKLxt9iXVk38Yy7H8nVX/B0HKYnVE1DhyfUAgoEVY W9oMNtKGUBq0zw5sPxPZ5KkVwM2xA6Q7GTtHXdsgsOr/3J3/kugDeSUxz/wEA8mDbTgdOB IUEy8p//4tK9nv2tWZL99j0qMAPOJmp87H9c9MRpmHJZws9HXSTUV5BGxiLazCbUgmOzyi vCKws9sxr+1WyWOcebpNhZw+Vv3UDwLkmT9D8LVsFD+BhsVe95Rzuw8bIGxP+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753102146; a=rsa-sha256; cv=none; b=u2bE5apE44RPA7EKC0i6WuO/mvduAdFC3M+TULw5WD5b1xwPfLuYPIpc+qed5WgqsmFtSA qeyh1qQoQR6aU/XEv1Z46cnKDQuNst/iwsJcY9GoP9053VS4d95aLTYveUeMvDPVWv0Clh oAl/1zqG7gZZW96jJFmZwkaB0NlsKqWiwj+EAAmU/Fa2XDA02s4m5TOEHdowMBvyA9EY4i etFJCC2vQTMH4A8P9hq4gpuxFUHvZikNQJhoVf9YzlhI5FO5Qs1pKSsWEVKCZfEHFB16D6 GNLRXlFE9mRKB9IbWhQqtaC9O+GeQkq3jbyTUbkwQd2IgbnKv118GE06strn5g== 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 4bm0Zp5VcFzy3X; Mon, 21 Jul 2025 12:49:06 +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 56LCn6Ka008468; Mon, 21 Jul 2025 12:49:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56LCn6bN008465; Mon, 21 Jul 2025 12:49:06 GMT (envelope-from git) Date: Mon, 21 Jul 2025 12:49:06 GMT Message-Id: <202507211249.56LCn6bN008465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 2e2903faa6ec - main - release: Generalise the OCI image build's pkg config List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e2903faa6ec3e85a0923661f307a163fe66b086 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=2e2903faa6ec3e85a0923661f307a163fe66b086 commit 2e2903faa6ec3e85a0923661f307a163fe66b086 Author: Doug Rabson AuthorDate: 2025-05-28 13:31:25 +0000 Commit: Doug Rabson 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 <