From nobody Sat Oct 03 14:36:02 2026 X-Original-To: dev-commits-src-branches@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 4hxp9h1WhJz6vWKq for ; Sat, 03 Oct 2026 14:36:08 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hxp9h06ZZz4JDw for ; Sat, 03 Oct 2026 14:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791038168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K15M9/y+QkQVrb02vNFLC/j+NnATRmiHdHjqRxO8kb8=; b=itGnqrpBCmqxx9rgz12BdctTDYGCfm7/ZmwbWEl9WOfk0d1UXDN0Uz33L5x56FlOqbPFny G+uVUCUVN1aogXubzdqtgC1Tz1ikRzz+P3L2p7r7Ox7Bu+nbLwSYZZI5P9SzfZKibpS8z+ 34nIFO0w3BE1JmuMMZ+YoCi1z8w70DhtB4yaj86w5dl8dxSFNqbM14YaH0kADtGCuC4NvS Yw3P+b8QkzxkHqaP/yOYtLN9sFth8Vgl1ZQPk5W2ovBqJN5vIwQv9aPoQM+MNSABMFqDvw tDB1XKyOo2uTrZhpzDLgVltgmlj4mlXP8fg2ekvbd6NdtZJfGzQyZ8pJ439Cwg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791038168; b=dGQGPKPouaW9PLfG0YTjyKGf+t65SjQfKcJHvdGeycnG+zVsKT3TzpkDrDJNPERHfIqGl6 t/BHDWh6J9U7LK6CMB9rCvkhspZDqLXCdfRBJl1rP85XbWSCeft5mDpfpQfrGIT77/L+ud On8WW3NDN8xlTphiOSKahgQFB2GQc5aFiQcjqxWadrP0KUKAwCv9OeyL1KTVwDDhX3rnYD KACupzLbSRNCl/Kf4N1vSCNQoqGutCtKJEYgHqH41q0GiB81Adb2bcH2K5KFsO6B5VZnOw FHSxSmHDO0Gl3sQ0QyyW47+gvp95pbPhUxF+kGyA4WaA2Xx4b8OEvyuOYu3Glw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791038168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K15M9/y+QkQVrb02vNFLC/j+NnATRmiHdHjqRxO8kb8=; b=VpWLiYuAxFLUxqJvn4toGTDOxYrVP8Fv4yOw2FZMjr1SQyEJCiRIlqGDLGUciNKvg8hsAF ewq44zXX01ea7hcYuiMPI4FOEv76HiH52lK/FDLc+Ae60kM34OXCVHNHSTeC7r47R1ajo5 rHFiQ+vCPkCrs0LBb39gO/WxbWrqcvSbBcz97q77FkMZk1rGJphLWG2BJtSO9KiuATj/av UimfxVzTHFCwvFoMShTH9gq58jQSBdWqhTFX4WPf6PSoh79MI865bxvE/s0wN1P7c3whYR OpymK0KPm1y5V1ej7MSZD+W8+2gwX0hQiGQmFD9NzLpgFLST38aemDTei0/xBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hxp9g5lqXz16NK for ; Sat, 03 Oct 2026 14:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ab46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Oct 2026 14:36:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Doug Rabson From: Dave Cottlehuber Subject: git: 8b360b405ccc - stable/14 - release: Avoid generating .pkgsave files in OCI images List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8b360b405ccca12ebdc9509049d9bccad4074e1e Auto-Submitted: auto-generated Date: Sat, 03 Oct 2026 14:36:02 +0000 Message-Id: <6ac112d2.3ab46.216e094d@gitrepo.freebsd.org> The branch stable/14 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=8b360b405ccca12ebdc9509049d9bccad4074e1e commit 8b360b405ccca12ebdc9509049d9bccad4074e1e Author: Doug Rabson AuthorDate: 2026-10-03 14:35:40 +0000 Commit: Dave Cottlehuber CommitDate: 2026-10-03 14:35:40 +0000 release: Avoid generating .pkgsave files in OCI images This also installs the pkg key from the current source tree instead of using the one currently installed on the host. Reviewed by: dch MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D52615 (cherry picked from commit e21e6e96b662dcbb2f0e37ab356c9dded62a586e) --- release/scripts/make-oci-image.sh | 10 +++++++++- release/tools/oci-image-runtime.conf | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/release/scripts/make-oci-image.sh b/release/scripts/make-oci-image.sh index cc599c76bd51..c1bd0ce67510 100644 --- a/release/scripts/make-oci-image.sh +++ b/release/scripts/make-oci-image.sh @@ -39,10 +39,18 @@ install_packages() { local abi=$1; shift local workdir=$1; shift local rootdir=${workdir}/rootfs + + # Make sure we have the keys needed for verifying package integrity if + # not already added by a parent image. if [ ! -d ${rootdir}/usr/share/keys/pkg/trusted ]; then mkdir -p ${rootdir}/usr/share/keys/pkg/trusted fi - cp /usr/share/keys/pkg/trusted/* ${rootdir}/usr/share/keys/pkg/trusted + for i in ${curdir}/../share/keys/pkg/trusted/pkg.*; do + if [ ! -f ${rootdir}/usr/share/keys/pkg/trusted/$(basename $i) ]; then + cp $i ${rootdir}/usr/share/keys/pkg/trusted + fi + done + # We install the packages and then remove repository metadata (keeping the # metadata for what was installed). This trims more than 40Mb from the # resulting image. diff --git a/release/tools/oci-image-runtime.conf b/release/tools/oci-image-runtime.conf index 93aad1e39250..db99e5640040 100644 --- a/release/tools/oci-image-runtime.conf +++ b/release/tools/oci-image-runtime.conf @@ -9,6 +9,10 @@ OCI_BASE_IMAGE=dynamic oci_image_build() { set_cmd ${workdir} /bin/sh + # The static image installed termcap.small into /usr/share/misc/termcap + # and we are replacing it with the full termcap file. We remove the + # small one first to avoid creating a .pkgsave file. + rm ${workdir}/rootfs/usr/share/misc/termcap install_packages ${abi} ${workdir} \ FreeBSD-runtime \ FreeBSD-certctl \