From nobody Wed Oct 28 05:52:42 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 4jDxNC0YBnz6wrVr for ; Wed, 28 Oct 2026 05:52:43 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jDxNB28vqz4LRc for ; Wed, 28 Oct 2026 05:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793166762; 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=4SRXMkihSBDlsrRa7ZgsIQjwZvLOCVvZ9nlWc/3PGsI=; b=NUjMNrsmxFXCpbl4/7sgUqfAb4FfCtxlFRPfBPZL/Zf4xn4aqs1+CJypb+cMD0RV/Q6mWS vQPU1VLGikWFrAu7eTUMcS4QWxcgq+HO3VEVQTqM+/u1T+b8+ct8uoRisvPLSDDISprL4q bEnv+uverkL0h/TIZOc6sTtTZ241yFQJyIeDODP6evNllJapJ4DXhWCWtv5lSDA5LJzZHS VzUWF0I141tk6eMUj9sBveZWZvqaT04mcZlvVAQv3OWe77Yw2+MsZToZYBiUpINDy4CyWz i/f96XYNS1D1uonrxKz/eLbhzJ1mwrsbQGh17qGZK2/gBNsNhUNO1rZ/yD/H1g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793166762; b=fB8Cr06TwxPj4dL3nY3fS36sBXSd3ErsiSiuBfKRWsvnB6A8ctJvFeUMVqGIfgnW95YG77 JuRC3OjsFRJdopgXFelswJhIEx1Ps3SiRozLyMExizJZaVJKjeFf8pjMl+6Cve5/fsRgTp VqgWHZufRJ9NJ+PSa9H6V2uakEgWINBCVDUIbe0u2RJBjzhyQCwLcdI5fT+M/AMmgUKlPZ M35VaDpkud4M6xmiSDvBr24h4q5JvE7VyRIbzEVpZkFuVwlIHomAft5qgx2YtRbYvZ3+Yr nzCTZ1FSUaq1Mbm3wk8/PMzbG2A1nX3IJIhgmRrcs+dOpz6RF5CwQFjXy72G7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793166762; 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=4SRXMkihSBDlsrRa7ZgsIQjwZvLOCVvZ9nlWc/3PGsI=; b=XBVQuFhr6B0mppF91N6FqCLaRhnZok1LrY+u3Dn76kO4exC41o99XqDSx3flLzKw0UIfQh Zktw5oT7D7PmJ4iVGbdrd3sZMXWuLAzDZGD3DUUI7Ybmyr50ty3IQ1tJQDWcFejhRKbaBf pdPmOgYe7ojH5ldxTlsGY/lxvYdOdIsc636BMCWxUzsVEnoZEgl+Kx/N2iURESUYVe9Wur 5M0MVd8ndFRbNZ6WXzwkFg1rag6U3QPAJtUqKm+Uc9XEPwjTMS4qnf2dNalgUKYXZw03Ja KONxRya1NrTikLTzaP8lIl5hJbinCL801pi2aPbxgjNnFmZpxlFbjONYfxODpw== 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 4jDxNB1myrzvYs for ; Wed, 28 Oct 2026 05:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36808 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 05:52:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 00a6cf0cf44a - stable/15 - mkimg: Ignore redundant %align values List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 00a6cf0cf44a879dce048e462cdf8195ecc9aee8 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 05:52:42 +0000 Message-Id: <6ae18daa.36808.10955452@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=00a6cf0cf44a879dce048e462cdf8195ecc9aee8 commit 00a6cf0cf44a879dce048e462cdf8195ecc9aee8 Author: Colin Percival AuthorDate: 2026-10-17 19:14:16 +0000 Commit: Colin Percival CommitDate: 2026-10-28 05:45:05 +0000 mkimg: Ignore redundant %align values Partitions are trivially aligned to sector boundaries, so asking e.g. for a partition to be aligned to a 64-byte boundary is pointless but harmless. Treat it as such, with a warning (in case the request was a mistake, e.g. requesting 1-byte instead of 1M-byte alignment) rather than as an error. Reviewed by: markj Suggested by: markj MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D60819 (cherry picked from commit da04cf02c96b97c587580b336fa527392467f689) --- usr.bin/mkimg/mkimg.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index d8f872b72261..ce0bc98a9f3f 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -516,7 +516,15 @@ mkimg(void) if (expand_number(align, &bytealign) == -1) err(EX_DATAERR, "partition %d", part->index + 1); - if ((bytealign == 0) || (bytealign % secsz != 0)) + if (bytealign == 0) + errx(EX_DATAERR, "partition %d: " + "invalid alignment", part->index + 1); + if (secsz % bytealign == 0) { + warnx("partition %d: ignoring " + "redundant alignment", part->index + 1); + bytealign = secsz; + } + if (bytealign % secsz != 0) errx(EX_DATAERR, "partition %d: " "invalid alignment", part->index + 1); blkalign = bytealign / secsz;