From nobody Mon Jul 27 03:45:21 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 4h7ky95RFlz6mSmR for ; Mon, 27 Jul 2026 03:45:21 +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 4h7ky94DDFz3hM0 for ; Mon, 27 Jul 2026 03:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785123921; 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=IaUooiyUWOO32ewTgIq7EWVNN3PghxK1YvatWALymoE=; b=F05N2ygLtJ419XqOCOQPKEIyqMTsG6x8fQS83de5qvyavrAHujINUAz65fUiOBsEnHIN3T 3ohfaK9PfOPi4TYojiTqMoLgBCMiCJBZYGx00ol5Kw5yr8POOioTkt88/oIEdqTt8O9jxX Ce5ZG1NYpoAmsR4q7M1fYHSrhGa1sDWIAJjzBsdL9UcDbn2B4C8eEoEbyNdF0HnkI+WFV3 fampy5gwQuIMcusPjUF7zoLRVE36k1zv+j0PonFzVKML0EGGFQxqMrxgeRCGVOmYNKlz3i mrVJSSL4fErF5P0NsNd6qNBir6dkobOkP4Jh+jOjtVKqsQuTTYFd1vHABKqz6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785123921; a=rsa-sha256; cv=none; b=D75uqVXma8F9KtfC/E6PVnl/KPx6JChFURZ8FwFqx+STkO1NJ/nOPsZwTa/gHb0iyvl4nt 4oKXVH5NgkVOKE5p1R6WsebP+1EPKVp8Hj1z6iUMfCBOQMuW1rvLRJBKMd7QXsFbNI6S7E Mg3TEpcR0zK4VJ6gIXslmfBya6c8UbbGpWZTPueE2o1k9crgSMPnHK5VYhAohWUhU7BmwR ytmFL56r4f5yRvbkz/Griz5Q1XrS6YgbTbyZdZi4XhrQrozPVdv+GW8tf5isNEofBuEDY3 2AYjetlItB57CdzNmO0K5zaKVNvu2mbGXwV82jiHcXCL0UQE8VmHF08O537RoA== 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=1785123921; 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=IaUooiyUWOO32ewTgIq7EWVNN3PghxK1YvatWALymoE=; b=e27hcacVILmAeV10uYPBUa2YX9GbT3uF5boCcD2km9Zfi2QdhbKB09XROycC11vZi7CEgz 3Y+PXqPdCxiZkdHZdpJRHrmk8nazRrxgxTOgSm3jDT7agiRUbMQmEWAEt2vrbrjSrWQxc+ JHDPbyDWw0+X3Ny9fUTmFq43CY3n01qVi6Gbnt/KY7CSm756YBnowFa3wLy58o5oL0caPK qYdvkfVj9SOBzCsrvhqBdaf4M8Sg///gDHQ0bf+SOhm4Wm8yONKii2bVLydY/zb4h93X0w FlEmImwzoDWGT5Gx/g/jLOBvN3XHpDpFMFR3dq5Jq56JhJC9QNYPO6b9Cnl10w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7ky91wL3zs4S for ; Mon, 27 Jul 2026 03:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eeac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 03:45:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 03c71ed44a04 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 03c71ed44a0480091be9408faf3386879a9ee759 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 03:45:21 +0000 Message-Id: <6a66d451.1eeac.6c0f8380@gitrepo.freebsd.org> The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=03c71ed44a0480091be9408faf3386879a9ee759 commit 03c71ed44a0480091be9408faf3386879a9ee759 Author: Jose Luis Duran AuthorDate: 2026-07-13 12:25:30 +0000 Commit: Jose Luis Duran CommitDate: 2026-07-27 03:42:48 +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 (cherry picked from commit 67f1c082b5ec37e2060b74e6f1f952ed38761468) --- 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 ed3f008c394f..5fae98e0d4ef 100644 --- a/usr.bin/mkimg/gpt.c +++ b/usr.bin/mkimg/gpt.c @@ -61,6 +61,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_NONE, 0 } /* Keep last! */ diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c index 85ed94013e8d..0af86f6d9111 100644 --- a/usr.bin/mkimg/scheme.c +++ b/usr.bin/mkimg/scheme.c @@ -54,6 +54,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 }, { NULL, ALIAS_NONE } /* Keep last! */ diff --git a/usr.bin/mkimg/scheme.h b/usr.bin/mkimg/scheme.h index 52614255595f..693f04983624 100644 --- a/usr.bin/mkimg/scheme.h +++ b/usr.bin/mkimg/scheme.h @@ -43,6 +43,7 @@ enum alias { ALIAS_FREEBSD_VINUM, ALIAS_FREEBSD_ZFS, ALIAS_MBR, + ALIAS_MS_BASIC_DATA, ALIAS_NTFS, ALIAS_PPCBOOT, /* end */