Date: Mon, 27 Feb 2023 17:19:56 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: cbf64e2dd59c - main - nanobsd: Better NANO_OBJ if NANO_LAYOUT is set Message-ID: <202302271719.31RHJueI035012@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cbf64e2dd59c3579c49acbc52659eaa1ddceb557 commit cbf64e2dd59c3579c49acbc52659eaa1ddceb557 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2023-02-08 23:19:49 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302271719.31RHJueI035012>