From nobody Sat Jan 17 18:13:06 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 4dtlFb1rxMz6P4F1 for ; Sat, 17 Jan 2026 18:13:07 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dtlFZ68swz3pHf for ; Sat, 17 Jan 2026 18:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768673586; 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=wElkdtRsgiHrFFBc7BA1S9zZBugaIIB6nYU14fxVtG4=; b=vLKDORtRA88Dx81Vhx7lhJJlQwQMR4eWKZ1vt0zXffdXJq89eUjmTHC278BEfDLzZ9haCj l2Ar4QaYwR9TWwB/OJmIE8xALF8MxsYX3YrQkHEJ9EyQRN7jpzw3JdJAqEEn2L+Y9hnRZP X7Gi0d36GASKzVoGZ/LG27fVTBfPbC3MKySec/Ul0yex73sDhPJWe3R7jfULaAnGw87X2W +4zgKs+YjkJYtrAblzS15hyxjashnxLnjHX9yTW6TCifkzwoTgEq8Z8DyJIEg3EwoHhYEs nohZnxd0JRG7y5uuWlGmerfAiCh55Sq3/D3BT3jVqcWcUEpGfOjqD++8Xyjwlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768673586; 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=wElkdtRsgiHrFFBc7BA1S9zZBugaIIB6nYU14fxVtG4=; b=TvkJmvRyGCFySEn+QacTfBPxz2Wylj6wOvRSlJZKcYdo7v57RqpJ219A3d8mOExtbAv1jm cQxna24uhwbRz1VHDOhwkA7BrG18bUmRBxQ1x8k3xrTMFgxbFqYHT6tbTyUWkQiSfz3YJE dShIiKPrlfLbqOcQA2uLjx0Ajog+6V6Z/4LOY0huwj0A8+WR7iZJ0IXt2rWWI64CPO5Zmz LE/bwalK40Vhj95+ixDi6j2rqFbC64MplNP5/cZW13Dndqvm4bO4CKQ30a81wx1anHgeNE bLkS7HX06xQ9DuEqgzGE5ZHuFre8HTMnn/NSrG9+iN/IC+36p7hbsFHfUuVVoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768673586; a=rsa-sha256; cv=none; b=MCaKefhCyKNggUvRQP0XCzIZfDnY/mwzSqGokJZMGFF37CWvmMmQnAPE0wuIOF1nOjBBoD /9jy4zdTi7Dr9nriAUrB2efQacU6Z5HW1EI67l4OF4qlIkTFWKyn0eQ/AeptzUzqMcv0rm fooFJnUCcq84sld0bR5XZQOZe+sSyMR5WInMlryB+PFYbK4ta9WHdy9oVZKdKYIYlWBUW7 4ZwHOGyHFIuddzxN/+iWx2b2O/UNLUwjNNwLMKAlEe5LiCPC/9SH5iTuj1tHvipcWxWWZj 5nb0slQcUjQyPuFWBdlZU58CSc4n8vLRl7aFr2QGBeSIKDuwnrXzb8ZSPn6TGg== 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 4dtlFZ40fkz193d for ; Sat, 17 Jan 2026 18:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39dbe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Jan 2026 18:13:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 5ba2a74e3a20 - main - nanobsd: Add a nano_makefs function 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: 5ba2a74e3a208ec5641832ffcb9674c0e4b06950 Auto-Submitted: auto-generated Date: Sat, 17 Jan 2026 18:13:06 +0000 Message-Id: <696bd132.39dbe.3ba0dd3@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=5ba2a74e3a208ec5641832ffcb9674c0e4b06950 commit 5ba2a74e3a208ec5641832ffcb9674c0e4b06950 Author: Jose Luis Duran AuthorDate: 2026-01-17 18:08:52 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-17 18:08:52 +0000 nanobsd: Add a nano_makefs function Add a NANO_MAKEFS global variable with options equivalent to NANO_NEWFS to be used with a nano_makefs function for creating images. Also add a function that adjusts the code size calculation, so makefs -s won't error about the minimum rounded size. Ideally this shim should be removed, therefore the suspicious _xxx prefix. Initially not wired. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48789 --- tools/tools/nanobsd/defaults.sh | 14 ++++++++++++++ tools/tools/nanobsd/legacy.sh | 11 +++++++++++ 2 files changed, 25 insertions(+) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 13e7797df2f5..9827095b334c 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -107,6 +107,7 @@ NANO_LATE_CUSTOMIZE="" # Newfs parameters to use NANO_NEWFS="-b 4096 -f 512 -i 8192 -U" +NANO_MAKEFS="-o bsize=4096,density=8192,fsize=512,softupdates=1,version=2" # The drive name of the media at runtime NANO_DRIVE=ada0 @@ -688,6 +689,18 @@ newfs_part() { mount -o async ${dev} ${mnt} } +nano_makefs() { + local dir image metalog options size + options=$1 + metalog=$2 + size=$3 + image=$4 + dir=$5 + + makefs ${options} -F "${metalog}" -N "${NANO_WORLDDIR}/etc" \ + -s "${size}b" -T "${NANO_TIMESTAMP}" -t ffs "${image}" "${dir}" +} + # Convenient spot to work around any umount issues that your build environment # hits by overriding this method. nano_umount() { @@ -1002,6 +1015,7 @@ set_defaults_and_export() { export_var NANO_IMGNAME export_var NANO_IMG1NAME export_var NANO_MAKE + export_var NANO_MAKEFS export_var NANO_MAKE_CONF_BUILD export_var NANO_MAKE_CONF_INSTALL export_var NANO_MEDIASIZE diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index 5ba2d81c6017..ff951f4b762b 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -92,6 +92,17 @@ calculate_partitioning() { ' > ${NANO_LOG}/_.partitioning } +_xxx_adjust_code_size() +{ + # XXX adjust the CODE_SIZE value by rounding it up to + # a bsize of 32768 (DFL_BLKSIZE). + # Otherwise makefs -s will fail because of the guard + # introduced in 5ad283b3c60d. + codesize=$1 + bsize=32768 + echo $(( ((codesize + (bsize - 1)) / bsize) * bsize )) +} + create_code_slice() { pprint 2 "build code slice" pprint 3 "log: ${NANO_OBJ}/_.cs"