From nobody Fri Dec 13 16:50:08 2024 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 4Y8wLS6J4Nz5gpR7; Fri, 13 Dec 2024 16:50: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8wLS3b4jz43Fh; Fri, 13 Dec 2024 16:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734108608; 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=2sL8UpXM7ryUnFcDGfFEP5yxeIkEj1CGUVvmD8f9mVg=; b=gDmMjJmp1+LG8mnsqmbcoClgm/9nkYKxYiuA8mbySN/Gyrd52b2BpD9foutm+fuBL+Mz+e soyHLsKCVSZZHUy9NjqVOHza4IXkOYk1K88NnSNvTsWoMtNwImv2LfC0f/KRWQIGvi7Ypp s33IIyO8JYpV2fGpIaF+mjkkQyfeIFtyk+uzoruejDUqzagQ9aFxYpn8HpXIx7pe8C26mL HXFTYM81NI5BXTMpmga4oEt4ISo/pynqINKDX3YRuup2c6Vn4PJZe+gqHn/y0bWBvYK5XR MKhth9kX2DOMh5mTTlFKwshqojqEN0olIyPr8hiP+acpT9f/Lc1JTOgImdDpwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734108608; 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=2sL8UpXM7ryUnFcDGfFEP5yxeIkEj1CGUVvmD8f9mVg=; b=O6bpazbJJZea9qYiWbBqktfcUr8Y4LS2KBKblPx2tM0GQbalLSBUBImI3b06zu2NGm9mWa Tl8957eXNWJ8gTEH5mHL+EQvL3LMAUvMJx7UhHFHxrItyzvIy/3k+XmRQpjg/6LUpo6Mbe 4OLWHfzvwW5mheLacPGpr3cJ01DQOt6l+QC40dzotdw6fpCeGn6yhiK/Q9MoqvZJ3Ue7PH BHdec9ptp6kpdIDbFKBJ910PHiNjF/Tq1sylDbhdQu1bRlr0l5s+L/6FUy8R6F5EB6yHuz 7nIF8DiCw10PDvBF8jtHApmpFU/4KhvAmMZwBxoPSvZS94Tu6YA0/hn9mDmPKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734108608; a=rsa-sha256; cv=none; b=eLcMKdpAPrc/qZ4lTmrjtHiR4ELmKREMvCpt9TfIFMtIntSMnRYdmr+s6oJrqANjwniSlg EqUgRuSEDmm2+vuIU5KLMr2BJ20rY5voafwI31QGDiFju4xr2uaOL62waqI6m+ncCeBngZ zVyJtg9W7rP+ZlzgZL6dPsiYvsAwZ60yp8nMpEX/A3oT9/jmaTwzaGsFPCKQ6d+XFmKQgb YZqJAwS/HtRtyso/5t3uh1+7i61pqOexxOYzH6YuYuMaUaHDKK6S6iDichYd/BR1Tfgcmw o1AV/ohdolJP7arRJ2/KD0KVTZ1IWIzW26SJUAyi2jszF0T0HWmXgCA++uxjFA== 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 4Y8wLS34yGzlp6; Fri, 13 Dec 2024 16:50:08 +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 4BDGo88E024920; Fri, 13 Dec 2024 16:50:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDGo89i024915; Fri, 13 Dec 2024 16:50:08 GMT (envelope-from git) Date: Fri, 13 Dec 2024 16:50:08 GMT Message-Id: <202412131650.4BDGo89i024915@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: e2fc29e53986 - main - release: fix architecture for 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: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2fc29e53986c69ac91d40e7f1ef8fbca317771e Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=e2fc29e53986c69ac91d40e7f1ef8fbca317771e commit e2fc29e53986c69ac91d40e7f1ef8fbca317771e Author: Doug Rabson AuthorDate: 2024-12-04 13:23:58 +0000 Commit: Doug Rabson CommitDate: 2024-12-13 16:47:05 +0000 release: fix architecture for OCI images PR: 283260 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48051 --- release/scripts/make-oci-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/make-oci-image.sh b/release/scripts/make-oci-image.sh index a139a38d1930..6180ed9d53b4 100644 --- a/release/scripts/make-oci-image.sh +++ b/release/scripts/make-oci-image.sh @@ -56,7 +56,7 @@ else base_image=scratch fi -c=$(buildah from ${base_image}) +c=$(buildah from --arch ${arch} ${base_image}) m=$(buildah mount $c) oci_image_build buildah unmount $c