From nobody Thu Mar 19 17:15:26 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 4fcC4t3XzRz6Vglf for ; Thu, 19 Mar 2026 17:15:26 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fcC4t1TNnz3mmr for ; Thu, 19 Mar 2026 17:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773940526; 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=DprK9K+SAkWSnsj0LNTy2kpP3UDZPqkKj4LhWY5yDh0=; b=XbbCuHufMneV6gWY7n20cLpIPFvyqRZBITbAQArmQK0j7b5y77Vkwj4EcTsXBuFHlm2Wvh CuFuTNewHw0AxIkwQPYLkf6OFVvyoXD0dKqB3WP3QJ44ZJP4IvAetIZv/vnF9VbIxBH2t1 OoLmMy84FPDrx7+ptiVzuig9Md8iRxS3BK1xDvfnH/0kjuTyBM6KCyyg+/trO/+qGJAObC qEymHW3KC0GqUtHjDl+lKeko8cGq44HrdI9JlJ6O7YC6QuoOPjrCnJ1Slx/FnLCnqH7/Iu Q64YbzzceUxUtTcsXvRr5jYb8qI9Xhb0UaY+t4NMnDIXFYpJnH703OX9+TZXhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773940526; a=rsa-sha256; cv=none; b=W4QMiZWveCC2VZHsroptOduwXIK02mYimJfALq1q7y2AiYIrmBIjbV/p45iJYdeYnmsHV1 Ge4CBfwb9E4Gfn/CjtayOp224jcNmQZyW2ZN5c9SErL1lIT+ArAWDplKqIwnG+rENXcqbV fg4TznihgM1e/ChZQffAoCMSfa/wbINim5CRm8uJWU7rYAwzzZAe++8YCrce0DN5pUPsst hdF0K3SYGICPzVCsY6Mu2+9OLrtOwWxdzYg1iE9kaSf6BU5s8lMrSnM480VLGEdqof0mGM Gmlv0YRKD0cuaGD9La1Zr1fxab7/Ino8F5Q3ntUxKIbhVtHFMorcVR13qR0Daw== 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=1773940526; 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=DprK9K+SAkWSnsj0LNTy2kpP3UDZPqkKj4LhWY5yDh0=; b=ZEufg/5QuJoxADHS1V2BGGuMLJnakizAmykQoduuDScw/b7VjGNEIpv8ZRcPf2ffwPVUjc jyIPrTYK6+w+pBBaUxu0mjBv1jjONvOkWjQYrLXssEiGxyr4wUB741VYsIdc9vprv3gO4k RqN8i5Qh/ldXp/jsGKEPJpNNPMMuiQBEeCWxLR31uLzoK0n6mAbS65Dw320y7gFL29Ie+I jp236Yu+x4xBVF+NCLWAYqDgwHmro0eeK0rHf2YqmjsvaFhd7TXi7O3w7UiJu5tqGpW9wH aTDY+7GWifNYALWJdsXUeK+ETdhXrwg8AImY971Y9rsWGZO4TsNMQXX2dfR4iQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcC4t148qz14Dc for ; Thu, 19 Mar 2026 17:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34880 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Mar 2026 17:15:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 5de9a54c76cf - main - nanobsd: embedded: Remove mtools dependency 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 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: 5de9a54c76cf4ce423685531f3d9ec256a31b1b6 Auto-Submitted: auto-generated Date: Thu, 19 Mar 2026 17:15:26 +0000 Message-Id: <69bc2f2e.34880.40456282@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=5de9a54c76cf4ce423685531f3d9ec256a31b1b6 commit 5de9a54c76cf4ce423685531f3d9ec256a31b1b6 Author: Jose Luis Duran AuthorDate: 2026-03-19 17:12:51 +0000 Commit: Jose Luis Duran CommitDate: 2026-03-19 17:12:51 +0000 nanobsd: embedded: Remove mtools dependency Rely on makefs -t msdos to create the MS-DOS partition and remove the dependency on filesystems/mtools. Note that NANO_SLICE_FAT_SIZEs defined in sectors (ending with an "s") are no longer supported, as a workaround the letter "b" (blocks) may be used instead. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54976 --- tools/tools/nanobsd/embedded/common | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index ebbe764f9028..2aaf9eee182e 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -37,7 +37,6 @@ # Missing in base: # o mkimg setting active partition # o mkimg starting at arbitrary offset (needed for A10, et al) -# o mtools still needed because we have no makefs -t msdos # o nanobsd doesn't record changes to WORLDTEMP in customization # scripts yet, so we have kludge to pick up all files # o easy way for pkg to grab files from other repos and put that @@ -49,7 +48,6 @@ # # Missing here # o documentation for how to run the qemu images -# o msdos mtools fallback # o special boot for !x86 !arm platforms # o qemu image for aarch64 # o qemu image for armv7 @@ -218,8 +216,6 @@ create_diskimage_mbr() { local extra i sz fat_scheme fat_size fat_type fmt fmtarg bootmbr \ bootbsd skiparg set -o xtrace - # Tell mtools not to be too picky - export MTOOLS_SKIP_CHECK=1 [ -z ${NANO_DISKIMAGE_FORMAT} ] || fmtarg="-f ${NANO_DISKIMAGE_FORMAT}" [ -z ${NANO_DISKIMAGE_FORMAT} ] || fmt=".${NANO_DISKIMAGE_FORMAT}" @@ -251,12 +247,14 @@ create_diskimage_mbr() { fat_scheme=fat16b fi - newfs_msdos -C ${NANO_SLICE_FAT_SIZE} -F "$fat_type" -L ${NANO_NAME} \ - ${NANO_LOG}/_.${NANO_SLICE_FAT} if [ -d ${NANO_FAT_DIR} ]; then - # Need to copy files from ${NANO_FATDIR} with mtools, or use - # makefs -t msdos once that's supported - mcopy -s -i ${NANO_LOG}/_.${NANO_SLICE_FAT} ${NANO_FAT_DIR}/* :: + makefs -t msdos \ + -o fat_type="$fat_type" \ + -o sectors_per_cluster=1 \ + -o volume_label="$NANO_NAME" \ + -o OEM_string="" \ + -s "$NANO_SLICE_FAT_SIZE" \ + "${NANO_LOG}/_.${NANO_SLICE_FAT}" "$NANO_FAT_DIR" fi fi @@ -504,10 +502,6 @@ if [ -n "$NANO_BOOT_PKG" ]; then echo ${NANO_BOOT_PKG} not installed. Sadly, it must be. exit 1 fi - if [ ! -x /usr/local/bin/mcopy ]; then - echo mtools not installed. Sadly, we gotta have it. - exit 1 - fi customize_cmd dos_boot_part fi