From nobody Tue Jul 22 19:08:30 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 4bmmy71bqtz5q334; Tue, 22 Jul 2025 19:08:31 +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 4bmmy675mqz3CQR; Tue, 22 Jul 2025 19:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753211311; 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=x7NT+OZct+a7jZoSo8W+eOPAmAKVMEc+thDnv0xHnG4=; b=yyDaxseTP3J9Tzw+eDCxWdC5+HVCaMiO3j6Uh16aXhsQWjU9XMsou87M+n7l9jQbyKf1qe /ujLJdWlxp5/kl+pXcIP0JpDY68kBD27cVsmWSUW8PI4Gsfypmd27xPJtDjAbfOQHpDzil zWbkiJB6IlWG5XcXIvYhXbIVqaV6rMQkTsY6aH6LNKYC5QOOYvBBGTcYkWiXaCBHEfKiBX LmHAw5WdwOS2pg0kn03fzvC/QsbPk3gRigaBP9F8EVENki7bwrHVVfJdiGFHYhscdaNUXq S4433vi13wQnLVdjdO2BafaT17PC2Hp3RAtGG2eQ/wIkA3OeRUENlu7dGyzxgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753211311; 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=x7NT+OZct+a7jZoSo8W+eOPAmAKVMEc+thDnv0xHnG4=; b=cFYGNNiYFgK6SSidRIZbaYJbcDHvVyIA5ADIBfu0bKjHWZp1xKHWIDAXBffGzxsQ9XfmtQ RbVzY6gnt6wVDR28sPWng65RCFqRsLmZ3QMHKRharcLj6cMP4r6Q+erll7kpaFWiL2x1PT m1ajjNdDoO2e2lS9EV4/e3pB6+sC/39XaMKwkbXmUqdEwX5SdfExHTeIwR+1yaZh3nBW3L 80Fykcn7Kg4swG6GP82CQeqzjbJVKBdc1FAA5OJHzya7Sok7olcI9nLRyZLuIHPe4ZsWzL RxnsMHnQDvO2pwGcMcNGivvHP3gij801tZmtb3wohs0NQUnaslwCxQCN3t8IWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753211311; a=rsa-sha256; cv=none; b=EF9r+zcZhZAg2CPt9hIjI/PFoVprClVFvstNe13GBLnv3WgAxIwus+lMVassBaxSnm4l2F LVXWV+V45oSl35Qs8h15HL10UjfBJ0vSJm5ox2BcOF9weUcTfoVi1/CLuYq4pZ6VFqGIii ybLQJjpbruAHrHVqmVJilD4n5p1fubtLyqJM/Y5qIfUsxSvY9PaCU7l20m1b056hM+3M4+ fFRPHuVmQBxY5OppAtF4VRotqKMzXfTChVzJ55fao+jCYptZV+bG8AVYBG+8F61UWGRCsL G0G/R3++P8xPV5xQrDzqm5TKO49xpCK+B4aGX5wUOmpw2aLqAkv45RfIuSXfTw== 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 4bmmy66f4kzgVq; Tue, 22 Jul 2025 19:08:30 +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 56MJ8Ups038486; Tue, 22 Jul 2025 19:08:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56MJ8UY3038482; Tue, 22 Jul 2025 19:08:30 GMT (envelope-from git) Date: Tue, 22 Jul 2025 19:08:30 GMT Message-Id: <202507221908.56MJ8UY3038482@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 5fe15d7cf39b - main - release: Don't install caroot in OCI images. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fe15d7cf39b7c29d0bad3839bbdafe29d5aa33d Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5fe15d7cf39b7c29d0bad3839bbdafe29d5aa33d commit 5fe15d7cf39b7c29d0bad3839bbdafe29d5aa33d Author: Dag-Erling Smørgrav AuthorDate: 2025-07-22 19:06:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-07-22 19:07:07 +0000 release: Don't install caroot in OCI images. Instead, use certctl to install certificates directly from the source tree into the image. Reviewed by: dfr Differential Revision: https://reviews.freebsd.org/D51404 --- release/tools/oci-image-static.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/release/tools/oci-image-static.conf b/release/tools/oci-image-static.conf index 753a03af653b..8e642d9defce 100644 --- a/release/tools/oci-image-static.conf +++ b/release/tools/oci-image-static.conf @@ -14,7 +14,7 @@ oci_image_build() { mtree -deU -p $m/usr -f ${srcdir}/etc/mtree/BSD.usr.dist > /dev/null mtree -deU -p $m/usr/include -f ${srcdir}/etc/mtree/BSD.include.dist > /dev/null mtree -deU -p $m/usr/lib -f ${srcdir}/etc/mtree/BSD.debug.dist > /dev/null - install_packages ${abi} ${workdir} FreeBSD-caroot FreeBSD-zoneinfo + install_packages ${abi} ${workdir} FreeBSD-zoneinfo cp ${srcdir}/etc/master.passwd $m/etc pwd_mkdb -p -d $m/etc $m/etc/master.passwd || return $? cp ${srcdir}/etc/group $m/etc || return $? @@ -22,7 +22,10 @@ oci_image_build() { # working directory to OBJDIR/release cp ../etc/termcap/termcap.small $m/etc/termcap.small || return $? cp ../etc/termcap/termcap.small $m/usr/share/misc/termcap || return $? - env DESTDIR=$m /usr/sbin/certctl rehash + env DESTDIR=$m \ + TRUSTPATH=${srcdir}/secure/caroot/trusted \ + UNTRUSTPATH=${srcdir}/secure/caroot/untrusted \ + certctl -c rehash # Generate a suitable repo config for pkgbase case ${branch} in CURRENT|STABLE|BETA*)