View | Details | Raw Unified | Return to bug 277269 | Differences between
and this patch

Collapse All | Expand All

(-)b/tools/tools/nanobsd/defaults.sh (-2 / +2 lines)
Lines 67-73 NANO_PKG_META_BASE=/var/db Link Here
67
# Make & parallel Make
67
# Make & parallel Make
68
NANO_MAKE="make"
68
NANO_MAKE="make"
69
NANO_NCPU=$(sysctl -n hw.ncpu)
69
NANO_NCPU=$(sysctl -n hw.ncpu)
70
NANO_PMAKE="make -j $NANO_NCPU"
70
NANO_PMAKE="" # "${NANO_MAKE} -j ${NANO_NCPU}"
71
71
72
# The default name for any image we create.
72
# The default name for any image we create.
73
NANO_IMGNAME="_.disk.full"
73
NANO_IMGNAME="_.disk.full"
Lines 889-894 set_defaults_and_export ( ) { Link Here
889
	: ${NANO_DISKIMGDIR:=${NANO_OBJ}}
889
	: ${NANO_DISKIMGDIR:=${NANO_OBJ}}
890
	: ${NANO_WORLDDIR:=${NANO_OBJ}/_.w}
890
	: ${NANO_WORLDDIR:=${NANO_OBJ}/_.w}
891
	: ${NANO_LOG:=${NANO_OBJ}}
891
	: ${NANO_LOG:=${NANO_OBJ}}
892
	: ${NANO_PMAKE:="${NANO_MAKE} -j ${NANO_NCPU}"}
892
	NANO_MAKE_CONF_BUILD=${MAKEOBJDIRPREFIX}/make.conf.build
893
	NANO_MAKE_CONF_BUILD=${MAKEOBJDIRPREFIX}/make.conf.build
893
	NANO_MAKE_CONF_INSTALL=${NANO_OBJ}/make.conf.install
894
	NANO_MAKE_CONF_INSTALL=${NANO_OBJ}/make.conf.install
894
895
895
- 

Return to bug 277269