diff options
| author | Warner Losh <imp@FreeBSD.org> | 2023-02-08 23:19:49 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2023-02-27 17:18:59 +0000 |
| commit | cbf64e2dd59c3579c49acbc52659eaa1ddceb557 (patch) | |
| tree | 1d7782f41703b5b30ebbf1e75ab5c72cdd6ed5b2 | |
| parent | de7a6b6fd04ee686364883a817a4b707e3567d27 (diff) | |
| download | src-cbf64e2dd59c3579c49acbc52659eaa1ddceb557.tar.gz src-cbf64e2dd59c3579c49acbc52659eaa1ddceb557.zip | |
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
| -rwxr-xr-x | tools/tools/nanobsd/defaults.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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} |