From nobody Thu Mar 19 17:15:28 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 4fcC4w6fRMz6VgqY for ; Thu, 19 Mar 2026 17:15:28 +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 4fcC4w35Gmz3mt6 for ; Thu, 19 Mar 2026 17:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773940528; 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=YvitV+lZNH50LOal+lolIVrxFhYqxiO+l/2qc9odrqM=; b=W5hEZlt0e4/PeQK95HsnXHdbnQD/TBSFj9UOeK1tiiIZkJmPAz5j6Hw7u/mQkbBbMtWAuW lO7dX+Cz8jbGOooWhk4Md65+0hbXh+khSXGlZRy2a/l/dvuzWXjuWsEsraH9eYrbn+ubx9 Y6n/tq1kWOb5IKLq31ruzOqznYFy/rp63tGUahrWNYgF07J5foMw8x+oQxC4ZPscesQjKy CqO9g6wJJ1jW6Tx+uq8dHGdjSfdHzSQHun2AQ/Z+nJUpDlsUg7uEDZri3ItZrkIeirBBN5 6QePoUwU+qdWNv0hJZQICfJcYSCINe7Aa4vEUVXgtk1jSQONPCi4+vIrcMqAYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773940528; a=rsa-sha256; cv=none; b=KQ6lG+w4CM+JReFZrWcguG/S94x2mfY01CWlldwLJ43jNNW3rJLoYfLHhqXZgscKB8bSQX KuanoZKAH9cX8UgQSQ+VsYp59jheYvY4UdwuF3kIwgvMJ+942xiZE8rfXLoNG08LBrAyz9 DP/bEkEC3Jc1IdtSpLMRh8WnnLrS5QlP6AXc2A8zPFm/1muCcoPKVTtXtfPo9MvzQwp+Px aK+ND/w8QNpPzCRz5c7XLvIzi6g8+YRNYMdGXu4paYxFyhWdMnjec4oj1gLUTVJeAzxc8n w9tCEmroOzCLi5My/XsYXKBNXDgPOGjiTRi3JYgBVrEO8wVP0/3AiVUR8lzyuA== 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=1773940528; 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=YvitV+lZNH50LOal+lolIVrxFhYqxiO+l/2qc9odrqM=; b=H9zL2emnwYBd2FZ3CS9wtVE/BdIa0KymeS+JOC+v7EPH4aEjVvG3Zu1/y6TYx6fs0i3m69 4oKgf1aBE0ZZwF4+t4fStIaEAlWglF4cvYrrxb8wEbGER9Q+7VVYbVvWN8Jrw7W/6KZRck LiLKkt89XttuNSbHvkfK7KK3GqrruS6HIy6FxYh/vcknq8MgCqx0s/op8eaKEXyWjBgsl8 h3sNa88A22eNnQUMpnYY4E1uUbRbjXA7owMymJYeWh9LjbgngJrdGKI2vAXn/+0NcLUzMI mY6TU/J5DU1Thg0W3UrtNTUUoLdSow6dFcFKPSM+T8LEcZYTsOHj1K5JpbaM4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcC4w2drkz14kg for ; Thu, 19 Mar 2026 17:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33d14 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Mar 2026 17:15:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 60f8d36f7eed - main - nanobsd: embedded: Fix more regressions from last cleanup 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: 60f8d36f7eedf397a8ec21ce58cb33a26f1aa4fc Auto-Submitted: auto-generated Date: Thu, 19 Mar 2026 17:15:28 +0000 Message-Id: <69bc2f30.33d14.48d27090@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=60f8d36f7eedf397a8ec21ce58cb33a26f1aa4fc commit 60f8d36f7eedf397a8ec21ce58cb33a26f1aa4fc Author: Jose Luis Duran AuthorDate: 2026-03-19 17:13:59 +0000 Commit: Jose Luis Duran CommitDate: 2026-03-19 17:13:59 +0000 nanobsd: embedded: Fix more regressions from last cleanup Commit c99bb5747f5e changed "()" grouping into "{}", but in these cases we chdir and depended on the subshell not changing the directory for the caller. Restore the old behavior. While things appear to work without this change, the previous code was intentionally structured this way. Reviewed by: imp Fixes: c99bb5747f5e ("nanobsd: minor formatting cleanup") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54978 --- tools/tools/nanobsd/embedded/common | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 69a7eb8bf848..bb3a2d707967 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -116,11 +116,11 @@ add_etc_make_conf() { } customize_cmd add_etc_make_conf -cust_install_machine_files() { +cust_install_machine_files() ( echo "cd ${NANO_CFG_BASE}/Files" cd ${NANO_CFG_BASE}/Files find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)' | cpio -dumpv ${NANO_WORLDDIR} -} +) customize_cmd cust_install_files customize_cmd cust_install_machine_files @@ -431,7 +431,7 @@ typical_embedded() { } customize_cmd typical_embedded -fix_pkg() { +fix_pkg() ( chdir ${NANO_WORLDDIR} mkdir -p pkg mkdir -p pkg/db @@ -450,7 +450,7 @@ fix_pkg() { echo "./pkg/db type=dir uname=root gname=wheel mode=0755" echo "./pkg/tmp type=dir uname=root gname=wheel mode=0755" ) >> ${NANO_METALOG} -} +) customize_cmd fix_pkg save_build() { @@ -476,7 +476,7 @@ customize_cmd shrink_md_fbsize customize_cmd cust_comconsole -dos_boot_part() { +dos_boot_part() ( local d=/usr/local/share/u-boot/${NANO_BOOT_PKG} local f=${NANO_FAT_DIR} @@ -493,7 +493,7 @@ dos_boot_part() { # Now we need to copy over dtb files from the build. cp ${NANO_WORLDDIR}/boot/dtb/*.dtb . -} +) if [ -n "$NANO_BOOT_PKG" ]; then d=/usr/local/share/u-boot/${NANO_BOOT_PKG}