From nobody Mon Jul 13 12:26:36 2026 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 4gzMB56yFcz6l8hJ for ; Mon, 13 Jul 2026 12:26:37 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gzMB54YTxz3S9j for ; Mon, 13 Jul 2026 12:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783945597; 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=XuA+cImAPtwwpvFOz7h2BA1UcTf5EnIr30b8FOoHFvg=; b=E4DpHOzSEkyQkG5Ac49/0hAvcRy/JoY4STWrDcScYag72e9hIVIl/ry96Krr5zGmVKr/G/ g99Op78y5eChpxbDzYsZUoyaHYNEb0emxwyt+w0UIm2qSRtAViunp4W+618r83PT0sw0Fx X2tvfXbfLF0L5h0o6BYS6Aq2cW5rJHmrZjr1Rd/2X73a5yUCQhMl4osjZVO0tGSTX1XqwM zOUU0ewoyU3dE9VanvU1Y7dG6qwGqivoqnn3bnY/+xPIFOdfDnRdryTl8X2fhoYjfU05fv Gb+4vSDf0gMekey7xxn+9unOk6BYdYUYFGfQIlLLhsoEMjEZupiuhF6Q5SGqtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783945597; a=rsa-sha256; cv=none; b=V3l3mr38QN+IzByYJmZnmDRNi5LdKEz7j/2uMFQRnOhZjYFTYnDyQOS8xD/tSTyEL3BjlS XY5uL3VB6+FK7m8+4rWNHofZMAvIf83fd6rKBO11eiApqe6kIgAZ7FHhqzKjCWwfUonFTr u86vpzEwxZpoUVrcuC98bJKY7BjhNCTKDoad4o0OlJGhVQsxR+nHMeNHXdPkLVJgL+/GkR oSDBAvFnJfAi7EthDAwrvwWtZ8XwlO+TJID6t7wyUqlbWraJkvMYku+p5YmwJcw6vQPLYw Rw0MkWUofhdHs9eXuDnzEcC5LDSg9muigzUOve+SQ4W1i68mnmBp6e7mVyohwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783945597; 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=XuA+cImAPtwwpvFOz7h2BA1UcTf5EnIr30b8FOoHFvg=; b=t12V3IgOPedglZk955dH1/ujz4CaMEAUTAXkbBy8wqFwYIn8XyRJbO+j9p2SLP8DmBrVG+ PBMKzSz8v8bXSjK8PWgKy4N9I1nj3stEgxqMSvTg4Iot1ik5lX6HPXKDP7RUWu6CUf/2fY 5XMrAdJYip3QnnWjZBI3fIklmBPq2hRmGtYB/Vd3kWofQNhdaoEfWBMUtpofl0DSWbC9pI u+PL0EYPa5jh3l5cj5v0XVpE1ZqSVyVA60Ukoyp38rbu5mpLbyU4W4LG6KxcprwigJCyHC e9505L+Xw486qc7fCRVuoQ6ECZKyIhVa/tlptOBjRlCM9VK/5UkoDp5s0igHYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gzMB445QszxWw for ; Mon, 13 Jul 2026 12:26:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2548b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Jul 2026 12:26:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 67f1c082b5ec - main - mkimg: Add ms-basic-data alias for GPT 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 List-Id: 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67f1c082b5ec37e2060b74e6f1f952ed38761468 Auto-Submitted: auto-generated Date: Mon, 13 Jul 2026 12:26:36 +0000 Message-Id: <6a54d97c.2548b.63fb44df@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=67f1c082b5ec37e2060b74e6f1f952ed38761468 commit 67f1c082b5ec37e2060b74e6f1f952ed38761468 Author: Jose Luis Duran AuthorDate: 2026-07-13 12:25:30 +0000 Commit: Jose Luis Duran CommitDate: 2026-07-13 12:25:30 +0000 mkimg: Add ms-basic-data alias for GPT While preparing GPT-schemed RaspberryPi images for the NanoBSD Reimagined GSoC 2026 project, a discrepancy was identified between mkimg(1) and gpart(8) regarding Microsoft Basic Data partitions (GUID !ebd0a0a2-b9e5-4433-87c0-68b6b72699c7). Currently, mkimg(1) relies on the MBR-centric name "ntfs" to identify this partition type under the GPT scheme. Conversely, gpart(8) identifies this type as "ms-basic-data". To allow automation scripts (such as those consuming from gpart backup) to use a common partition type across tools, add ALIAS_MS_BASIC_DATA as a valid alias. This is part of a larger effort to avoid a custom, MBR-based image generation logic for embedded SoCs like the Raspberry Pi, standardizing on GPT layouts across all supported FreeBSD embedded devices. Reviewed by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D58198 --- usr.bin/mkimg/gpt.c | 1 + usr.bin/mkimg/scheme.c | 1 + usr.bin/mkimg/scheme.h | 1 + 3 files changed, 3 insertions(+) diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c index 4471cfa1d4b4..9b5392cb2e2c 100644 --- a/usr.bin/mkimg/gpt.c +++ b/usr.bin/mkimg/gpt.c @@ -66,6 +66,7 @@ static struct mkimg_alias gpt_aliases[] = { { ALIAS_FREEBSD_VINUM, ALIAS_PTR2TYPE(&gpt_uuid_freebsd_vinum) }, { ALIAS_FREEBSD_ZFS, ALIAS_PTR2TYPE(&gpt_uuid_freebsd_zfs) }, { ALIAS_MBR, ALIAS_PTR2TYPE(&gpt_uuid_mbr) }, + { ALIAS_MS_BASIC_DATA, ALIAS_PTR2TYPE(&gpt_uuid_ms_basic_data) }, { ALIAS_NTFS, ALIAS_PTR2TYPE(&gpt_uuid_ms_basic_data) }, { ALIAS_PPCBOOT, ALIAS_PTR2TYPE(&gpt_uuid_prep_boot) }, { ALIAS_HIFIVE_BBL, ALIAS_PTR2TYPE(&gpt_uuid_hifive_bbl) }, diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c index b64cfe8bd007..fe71c6f5a3a2 100644 --- a/usr.bin/mkimg/scheme.c +++ b/usr.bin/mkimg/scheme.c @@ -56,6 +56,7 @@ static struct { { "freebsd-vinum", ALIAS_FREEBSD_VINUM }, { "freebsd-zfs", ALIAS_FREEBSD_ZFS }, { "mbr", ALIAS_MBR }, + { "ms-basic-data", ALIAS_MS_BASIC_DATA }, { "ntfs", ALIAS_NTFS }, { "prepboot", ALIAS_PPCBOOT }, { "hifive-bbl", ALIAS_HIFIVE_BBL }, diff --git a/usr.bin/mkimg/scheme.h b/usr.bin/mkimg/scheme.h index 7a5e09036ee3..8baad49fe1e0 100644 --- a/usr.bin/mkimg/scheme.h +++ b/usr.bin/mkimg/scheme.h @@ -45,6 +45,7 @@ enum alias { ALIAS_FREEBSD_VINUM, ALIAS_FREEBSD_ZFS, ALIAS_MBR, + ALIAS_MS_BASIC_DATA, ALIAS_NTFS, ALIAS_PPCBOOT, ALIAS_HIFIVE_BBL,