From owner-dev-commits-src-branches@freebsd.org Tue Mar 2 13:03:03 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id E6552569022;
Tue, 2 Mar 2021 13:03:03 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4DqckH348xz3sQn;
Tue, 2 Mar 2021 13:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 6D7C2171CE;
Tue, 2 Mar 2021 13:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 122D32rU066058;
Tue, 2 Mar 2021 13:03:02 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 122D326O066057;
Tue, 2 Mar 2021 13:03:02 GMT (envelope-from git)
Date: Tue, 2 Mar 2021 13:03:02 GMT
Message-Id: <202103021303.122D326O066057@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 9c5f4f8e4ee8 - stable/13 - mkimg: We always want the last block
of the last inserted partition
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9c5f4f8e4ee8261a669ab99257bffd439bad6635
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Mar 2021 13:03:04 -0000
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=9c5f4f8e4ee8261a669ab99257bffd439bad6635
commit 9c5f4f8e4ee8261a669ab99257bffd439bad6635
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-02-25 15:34:28 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2021-03-02 13:02:45 +0000
mkimg: We always want the last block of the last inserted partition
Even with an absolute offset we want to know the last block the partition
otherwise we endup with an image the size of the metadata.
This allow to create image with the ESP placed at a specific position which
is useful on arm/arm64 where u-boot have always a hard time to read the ESP
if it's not aligned on 512k.
mkimg -v -o sdcard -s gpt -p efi::54M:1M -p freebsd-ufs::1G
now works.
MFC after: 3 days
(cherry picked from commit 3b6268bb9e4aea939c4ce7f37353174aa90e6751)
---
usr.bin/mkimg/mkimg.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c
index d870f3a8f0c3..c4f0acbe3927 100644
--- a/usr.bin/mkimg/mkimg.c
+++ b/usr.bin/mkimg/mkimg.c
@@ -528,10 +528,8 @@ mkimg(void)
(long long)blkoffset);
}
}
- if (!abs_offset) {
- block = scheme_metadata(SCHEME_META_PART_AFTER,
- part->block + part->size);
- }
+ block = scheme_metadata(SCHEME_META_PART_AFTER,
+ part->block + part->size);
}
mkimg_validate();