From nobody Thu Dec 21 18:15:31 2023 X-Original-To: dev-commits-src-main@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 4SwzBD07GWz554rL; Thu, 21 Dec 2023 18:15:32 +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 4SwzBC6jbfz3Wk2; Thu, 21 Dec 2023 18:15:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703182531; 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=g8FRkMmlNkmIfWbbVD5tug24BVkM5gioiNS1Qt6ZfW0=; b=h4BsqO+M5ffPMAfEvA+2NuFh5HQnJ4rywkhLFZc0neT7ZEkFxA1dWO0LMUm029r2fISdxc 7N63d6WU/Sb+/6Qdy955GF2FFOPwhVj4O9+DYCoLhQQvzM4SHW6DmA60xKDPSyjyNtEvsX 06es4wuusWwJX0J8aAcDqyyBER1pXqcBIlIsHVsbnv2NxY+fDakwvjg14j/nEn7MsKZWnl ypevVYGHPeMGuOLPm24G35yDSqYwSz1YrB1yW9hFhT+RIYJZL7llp2SuD4Fn/vWadmVn0L 3LrT2sPVbDb3A70+J/eGzLCkXx7T8dCz4ZPWPC/Swy3JDsJ3ss/A2yQaLNSEhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703182531; a=rsa-sha256; cv=none; b=xWgz2NX4a+KA75HHoXobDtaNFt/k67JsOVXQTjF5eMwJtszC/zxtPxo4ugqFwo5hBs4SCT +5zBDXBRq0TcWHVZEwkMUzn/usX8eOEthmmkmAAU6o1UfZ3RYQMErt+6KA+9zZwOcdEcas 2MRmgIQdnqVtwFTBjCsp+emw8+Vs7zv9y1G17NMkt7/HB5HLhgfNWqj3dqTlBbvWYAkQCI 0/70kr6lG/1w+nVItCW1AGpNVS22HldKWlpcMu1ZMTy4z/jhEJEScKvSFFtzqysCmm4uk1 8vb7l8MCtP54FbOnYnSSoWLenxt9bSM7n0N9sLhmqvUgBuwBv5/l0fKKwsWTzQ== 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=1703182531; 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=g8FRkMmlNkmIfWbbVD5tug24BVkM5gioiNS1Qt6ZfW0=; b=uzainVxpCWw0bnixt6Mvv/C0OA3ELgZCC4voox9mQdWfCVE6qOsLsJdYCp1uTXERh8jluV 3JcE16jWNCmPcCSfrdeIvRM9bchp8wufpdNSKs+/90/WewdSqHpeJ4/hHNEk2bGGPqtYem zpEHOcfcPCKkpA0mn7Mcozo4qcaSQ/IJGTj/j1wNF1/k92lvqgs/0OkSa+CCiHvDwEfvAJ /smirr0C4Txx6rX7DR2PL165M+yhcx01rcOgjOaXagaYj16Vs6Rxn3iSVEIlx/dpYqZvfK Bil/hSu1kfAzBtuxkShf7Izw6e9HjVdaJY+LrM9DstMi7VpFSp8GJ6Aw+NSLNQ== 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 4SwzBC5mVGzjsZ; Thu, 21 Dec 2023 18:15:31 +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 3BLIFVvt033625; Thu, 21 Dec 2023 18:15:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BLIFVLi033622; Thu, 21 Dec 2023 18:15:31 GMT (envelope-from git) Date: Thu, 21 Dec 2023 18:15:31 GMT Message-Id: <202312211815.3BLIFVLi033622@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 330089470f56 - main - nanobsd: Fix the fix to a typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 330089470f56d502c629352b85e11522691e3368 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=330089470f56d502c629352b85e11522691e3368 commit 330089470f56d502c629352b85e11522691e3368 Author: Gleb Smirnoff AuthorDate: 2023-12-21 18:13:44 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-21 18:13:44 +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 --- 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 1fa7a74fd27b..165c967de807 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}