From nobody Wed Feb 02 14:24:11 2022 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 1BF41193B897; Wed, 2 Feb 2022 14:24:12 +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 4JpkZN0Fv3z3MP6; Wed, 2 Feb 2022 14:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643811852; 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=XApCx9gpcE69ItZx2KE2Vm1ggYOFMx5l/L4bl2qxAL4=; b=C4ftmXVwYpBZUp94+DM3tRIPAzAhVc1Q9F53eboy3WWSu3KbXf3gOBvvOA9eOEoqYJzIEe NaE87Fr8lSYSXNn1RYZCZvO6xR9w/lySlBZ2QTOkje83/Y1uFLuBABATmIXwTEmFj2TFVb 55DNaEflDHDmIPbjsxWcEUmKSpSYa2G76wptqrNdG68carr4BKYwaJNCIzAMntLOrr5jh5 BnCxCgGlI6dbIS1fuFGmLI6Pf6a5zILYyJQxxTNygGohLJSswAHoDac9SymrsekIyVnVhT uSA4qjkz1/kpbXDdZB/Xn0k8tQWS+kUlmABcHvUCZVzJvfzJHXTYPBN5SiQOKA== 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 DCD9B25874; Wed, 2 Feb 2022 14:24:11 +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 212EOBCd097620; Wed, 2 Feb 2022 14:24:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 212EOBWb097619; Wed, 2 Feb 2022 14:24:11 GMT (envelope-from git) Date: Wed, 2 Feb 2022 14:24:11 GMT Message-Id: <202202021424.212EOBWb097619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 34d6f05e22f4 - stable/12 - mkimg: We always want the last block of the last inserted partition 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 34d6f05e22f4f86c06175a562e12698a04abda96 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643811852; 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=XApCx9gpcE69ItZx2KE2Vm1ggYOFMx5l/L4bl2qxAL4=; b=QQ2REWvY3aEKq2u41A8W2/12OgeSluyVJbSoAJyGZFi+61qGj6ikFo76tbX+NidgSZjVGZ C/hsV4dG4KpdyNKfjpulabL43zHE3/pM2k1Fezfo3vgsR+LWzZr9RukZe9z2kFP+4SgrcW 73EHHSEP+zOP/Hp6YeguceuTwAGR4HaZu54xbwmaxnYkMvcEfoZQ7jg52fn/ubBd9NElMv Ww2IlHlr7OeXYOaKHArzCdWhraYdtB+Qk5cpfjfzjn5UO8zWCVjoasfPYF/aAGZbkMOADn tkkur4zFAKjyrcZgFAnipZN03L8uSEbQ4HD/zmR5MPKJ+tsAoUg+twbkPp1IdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643811852; a=rsa-sha256; cv=none; b=NYiYnlYyjqvan04OR4gunco+xX1pdKW+Z7kOEVGqdNX8wu5AuWh2KGJ8BaxgFrsj8w5B0T uf2DJCLFXbCMu8Hsr0CmxpqmkEY8NZ1utGeYmNboP/yScJMj/Yz1xVjoUdp5Px6o20aA7C MeT4MQKely798eVWinEfB+B5aaylg/XwijCOUlPLa7vtj5C6cdEXp0VlUi+uQl/Yby41fo wMoWzh4ve4uOib4YW4PT25NdK0qXT8A8nWdJMxKrCTPEUVhg9NbDRq+W10QX1ycFH9rLhD 1MpIzQ9Wvc5dz5b3u+dggpkmBxAPnorjd2rdzIKMFHsq44fUZM9wiPRDy5B6kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=34d6f05e22f4f86c06175a562e12698a04abda96 commit 34d6f05e22f4f86c06175a562e12698a04abda96 Author: Emmanuel Vadot AuthorDate: 2021-02-25 15:34:28 +0000 Commit: Li-Wen Hsu CommitDate: 2022-02-02 14:18:56 +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 8967e538df42..8bfbeb753170 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();