From nobody Sun Jan 19 10:31:48 2025 X-Original-To: dev-commits-src-all@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 4YbVBs0NWSz5l2PJ; Sun, 19 Jan 2025 10:31:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YbVBr6gQ1z4Ntm; Sun, 19 Jan 2025 10:31:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737282708; 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=y3Yc5RxiFnwtcxuuQEoyjKKCLQXsmRyNx9+/7CKWSlU=; b=OmmxBCc9Dd6xd0buWq1uH2ILs4MChgZdc0t4a6nZrI4UI/RV8jhQjYqoHDrBwOwANWvhSE JGwUbLWUtR9MR/JamX/Yv1u1XEaBYeiKLc+pxtm9XmUPBOeOMiSwJ/NKSQtItyN/lMXFwq MWzx3o9XHHmAFAbJBnplO4NVnJQ9HWpXrrVLk00ySOplmKHgfIqwzr6WuawcOcdkOL18x2 rqDwKkbf+2sTcX7UcWp5UKN7vvRWt7kvAktHKX/8x1G2BGHngmAKSbKju7HWu+yhrqIW9p 5hEa25bzRDpzl7TQn9Rq6MI80XtqhyiJskxntrxu1bvMr0Ux9n41CAp2wzMkvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737282708; 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=y3Yc5RxiFnwtcxuuQEoyjKKCLQXsmRyNx9+/7CKWSlU=; b=tXQZZR640+SHBOsA91J8y3G0WxR5zJ50R38oif8UHjVVtbt/X7/PcFg1f2n2IOpZ+l6Xsf 7LxhR6K4gQh38JrBFwgjD3y1DGEBFwZVyCfVGfxKr/QoenzCaV4b5DcqWgUqcAu8p0In48 EzcymRFWjIDttN8OlyxZ+Qu8zQ8MmljkviwwxQ8VmD78wUNiaPjpTzGFt9+cF38g+Pz8wu gYFIfa1aS4z3I0KT88jhmmWbS3SffVu0Wn7rkD8IaSHaGM3j1YOG27f0rDIZ6Hc7Ynq/+q ZZijd3AXCwRN2m+Ynz3oRBS3wmOrliGyKe7jtiJozFcvM1vExQ17o8IVw4vT7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737282708; a=rsa-sha256; cv=none; b=h/LU/rBf+vAEG2M8aT1Yo42dHOPAz2Uqzq4rpC4MsdmJsEHrUSP22VBfwiEKELl844Ru47 gwiG8E5qmdBr2lEXHa70sXgYRS/RC5Obfp+6r6EDxz4AABmyCIwPSulpMskhVcPTQ7sSZW MP0saQ9aJFs+d5/ORQ5+k2PaWPOnFyPsjixUjyOQ6KwmhsYFpqHLwrMH1GYqbAIdOtbHXn 8Yr7ThIqE4zUZ/hJ+S6ndty/XpusnyC09GmxtABFbf5mgWyY2vp/q4UfiCQAbbUnwNTkAM jErI68fSp38xvktca209cR69vHTrwN+JP+wr5y0Al8DUi2mz2twV0+bVwIMNIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YbVBr6G7Nzmqv; Sun, 19 Jan 2025 10:31:48 +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 50JAVmZS066168; Sun, 19 Jan 2025 10:31:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50JAVmcI066165; Sun, 19 Jan 2025 10:31:48 GMT (envelope-from git) Date: Sun, 19 Jan 2025 10:31:48 GMT Message-Id: <202501191031.50JAVmcI066165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: bfa14ad08796 - stable/14 - release: fix architecture for OCI images List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: bfa14ad08796f33435ad57f393725ca56fcbfce5 Auto-Submitted: auto-generated The branch stable/14 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=bfa14ad08796f33435ad57f393725ca56fcbfce5 commit bfa14ad08796f33435ad57f393725ca56fcbfce5 Author: Doug Rabson AuthorDate: 2024-12-04 13:23:58 +0000 Commit: Doug Rabson CommitDate: 2025-01-19 10:31:02 +0000 release: fix architecture for OCI images PR: 283260 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48051 (cherry picked from commit e2fc29e53986c69ac91d40e7f1ef8fbca317771e) --- 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