From nobody Mon Feb 27 17:19:56 2023 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 4PQS186jZGz3vNCd; Mon, 27 Feb 2023 17:19:56 +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 4PQS186Drnz3qtL; Mon, 27 Feb 2023 17:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677518396; 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=INJK32/mYCtqSQrm3G7PY6R1Fq3QCxZ8CH7I5bAsGWI=; b=Bk8uu9Le+wT4Iuk6bIrERcig8tGtdCYsh/5g9jKx0JYroZ8HIfCMGPZk9foUNhO8WjdiRt mdEIvpVKp9iTNYAOgv0/eZ1cVH4nVcrHnRc7HhpRYgKqN7JGnAqgty3sCe3Gpv/LbHOy0D kz+Kaxrdgro2cWHgA55gF4oVtgB1lr3AH4cAGrphy33+6bwwNX/O+lJsHV+Ds0smZC+fel Djbuij9MIT+c/7v4ErBv4kXVZsPs5EWCeSHO0L/NeDT1bA6Pb2gdH3U+SgLEyIBhihc0pN EU8vvD3jj3I9ynsOVfKAnb/QpLES22zMB9LZSYf86rzfvEvNvforDbxH+Sby3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677518396; 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=INJK32/mYCtqSQrm3G7PY6R1Fq3QCxZ8CH7I5bAsGWI=; b=r7HdLUbg59ekoHVuZwiYlCS1P92LxdZ4Jg8RaNJT17U2wWsnoYzfOUyuQfcdFbaxCLJilj Yz5BRiQktQ/VWJYr2UD7LGcBw46kKi4TgCjSC1P6Cp7ionfobDztW9WdSZDR1oS0avwb42 odKY/eQ0gdWWwWqQxGby7TFJGqPOz0STPS2xD1FxPznBi1AcW0FWftNamidI50HfFojS4g z1EisqKtOG3tX1+V3r5785vr3ggc6Eut/iOh9aZx4hmk06jtTSpK6l6R6RiHlk0WY/zEf5 cDqq+ykMvhbA4KcoMbbuLRrMTAOLzja1KjnAkOXuppdNmci5x4ePCoMoWpc6RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677518396; a=rsa-sha256; cv=none; b=jX8Ne0n+tDFY8HdNbV5qxGdhyFg6Ip3xX8w44mZlxQmLCNZ/sealPhrrheI3Q2UClqjWHM NQg0nCPJlSQGMJT9Xltzmpm7G3CJ3E2c/r0/iz0CGMa7lIqtxYoocvynhTzA3m8M4s/tgO mX3uTL89VIW6yyJEHx12LC2TOQoyXcc+Td8TwO0f99CdulNWN64GvSmK5Pjv9XWtIEi9s2 NEB1cDesde72uquM6mIsA1sUGserhbFQZJUBqEXg5gkdkdaJvUSeCuaS9yU9qT9ZRJpHHb 1gX9/HfXy4KfuVztD/CFRxmTg93U++n/jtMtZpHgJLQZjg633VpP7i2k1cBH+A== 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 4PQS1858F2zYhC; Mon, 27 Feb 2023 17:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31RHJu5R035013; Mon, 27 Feb 2023 17:19:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RHJueI035012; Mon, 27 Feb 2023 17:19:56 GMT (envelope-from git) Date: Mon, 27 Feb 2023 17:19:56 GMT Message-Id: <202302271719.31RHJueI035012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: cbf64e2dd59c - main - nanobsd: Better NANO_OBJ if NANO_LAYOUT is set 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbf64e2dd59c3579c49acbc52659eaa1ddceb557 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cbf64e2dd59c3579c49acbc52659eaa1ddceb557 commit cbf64e2dd59c3579c49acbc52659eaa1ddceb557 Author: Warner Losh AuthorDate: 2023-02-08 23:19:49 +0000 Commit: Warner Losh CommitDate: 2023-02-27 17:18:59 +0000 nanobsd: Better NANO_OBJ if NANO_LAYOUT is set If NANO_LAYOUT is set, then use /usr/obj/nanobsd.${NANO_NAME}.${NANO_LAYOUT} instead of the current /usr/obj/nanobsd.${NANO_NAME} to allow multiple layouts to be built w/o errors due to the time-skew that creates. PR: 269366 Suggested by: Eugene Grosbein Sponsored by: Netflix --- 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 45d9fe44c650..cd1e89a0c859 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -885,7 +885,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_OBJ:=/usr/obj/nanobsd.${NANO_NAME}${NANO_LAYOUT:+.${NANO_LAYOUT}} : ${MAKEOBJDIRPREFIX:=${NANO_OBJ}} : ${NANO_DISKIMGDIR:=${NANO_OBJ}} : ${NANO_WORLDDIR:=${NANO_OBJ}/_.w}