From nobody Tue Jan 02 19:05:22 2024 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 4T4MkB60ngz565bn; Tue, 2 Jan 2024 19:05:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T4MkB4S1Yz4JZv; Tue, 2 Jan 2024 19:05:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704222322; 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=8RW5uykesfUDAlkmuuv9i7lgYWhX7P78LDzrgfHSSR8=; b=KyzfDKEDVBk7TRFqXChA8T1XaxF+5q1S06IaM5pCaO9l/eZay5r9GqH57sbnC5WGt2z9wh D30MXo53eO3bzFpHJeKd9/B8HlL+l3mlCiyHLod5CMZfsDBT7DxsyBeQRKMsMDVcfoapdI NbwFQWX8yueEA+gtrmcFXdiMU3S7Vc4uGVZIvYrdvhiee9K/vNct+llNyNZAFLi90/9wsJ dIbzvNReQVKuvF058JGra+2sFBVlGQvE8ovLIR8/llGfB1BxDybWYt29S5pl8eHnHFA9ii SKOV+BGkap/NUSvNL67fskMEtgADQ+P4fqgS+foD73ZKS73F4YjjLdfukIJYzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704222322; a=rsa-sha256; cv=none; b=wzf77vy9Q2rxc64QGVxY+iU5IWBUvrz8jeqTcoM/0tsBYuuEnbgUi5pxX7gRIjPZNdKPxu tbPnyz2ZN6oJ6GagasTns/Ne8MwP8//GFzzh7EO6sQAVbioxhV6OS/0DMBnwraLXMsC/6v /AC1iL4AxKJkegffh+8mVbZepak6m3vveBiCTdGc/nW2q7sjDQ+nSCDeHYZP0JBXH0xr8Y IofzpEz/OBoriq1p/vuQ0355BSxdhHALp8Xo9xsxGen6hl3jQOX1eW4s0q4j0ibo0xBAbo rjugunSAk24CC0chd8L+/UkSNXE1hO3gHgxqq64Z/tE8vaCNkeYxKDXvQVmrBg== 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=1704222322; 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=8RW5uykesfUDAlkmuuv9i7lgYWhX7P78LDzrgfHSSR8=; b=eKqdnmN3MQ0pDhpHTx7/m79b8l4DiOeqMJ0FFaXfInfavXGQLlw8pnilnaIYryJWeQiBNv pVxesdXstNhcasfflK1vNTN6aRIJrw5Q8JR4+8ZkJHbquYNPlvI0tr0++vswGkLiS6xG79 Uxe7+mnh2+D0kK1IPZuzMnw9PfwtTI6PKDdSR6YWsjqtQ/kik3jdSTuAyL6gA4rMm3k/N0 XPXrbXOhjyG/ZPDt3VOodKLchPM+Mk9CwSd8mQepFzkFUQqjdZqXN31psUbutSCMTQvOXJ qVohFtPEM+zatlNZt2Qtsp8PDJs3Ey9r3DGEmpz4GwO/0gUHa58wuNHHSGFT5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T4MkB3XTmz1CFV; Tue, 2 Jan 2024 19:05:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 402J5Mjb053037; Tue, 2 Jan 2024 19:05:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 402J5MST053034; Tue, 2 Jan 2024 19:05:22 GMT (envelope-from git) Date: Tue, 2 Jan 2024 19:05:22 GMT Message-Id: <202401021905.402J5MST053034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: 98bac6fb064c - stable/14 - nanobsd: Fix the fix to a typo 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 98bac6fb064ca7536ddb67b845c653b926b699a5 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=98bac6fb064ca7536ddb67b845c653b926b699a5 commit 98bac6fb064ca7536ddb67b845c653b926b699a5 Author: Gleb Smirnoff AuthorDate: 2023-12-21 18:13:44 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-02 19:05:08 +0000 nanobsd: Fix the fix to a typo Submitted by: jlduran@gmail.com Reviewed by: imp, glebius, emaste PR: 275691 Differential Revision: https://reviews.freebsd.org/D43035 Fixes: d8c70d6dfb65218dd3272b34512083621d3ed46d (cherry picked from commit 330089470f56d502c629352b85e11522691e3368) --- tools/tools/nanobsd/defaults.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index d9de03fe72da..55314d7ef78d 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -884,7 +884,7 @@ export_var ( ) { # Don't wawnt a subshell # Call this function to set defaults _after_ parsing options. # dont want a subshell otherwise variable setting is thrown away. set_defaults_and_export ( ) { - : ${NANO_OBJ:=/usr/obj/nanobsd.${NANO_NAME}${NANO_LAYOUT}:+.${NANO_LAYOUT}} + : ${NANO_OBJ:=/usr/obj/nanobsd.${NANO_NAME}${NANO_LAYOUT:+.${NANO_LAYOUT}}} : ${MAKEOBJDIRPREFIX:=${NANO_OBJ}} : ${NANO_DISKIMGDIR:=${NANO_OBJ}} : ${NANO_WORLDDIR:=${NANO_OBJ}/_.w}