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

Collapse All | Expand All

(-)b/tools/tools/nanobsd/defaults.sh (-4 / +5 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"
71
70
72
# The default name for any image we create.
71
# The default name for any image we create.
73
NANO_IMGNAME="_.disk.full"
72
NANO_IMGNAME="_.disk.full"
Lines 308-314 build_world ( ) ( Link Here
308
	nano_make_build_env
307
	nano_make_build_env
309
	set -o xtrace
308
	set -o xtrace
310
	cd "${NANO_SRC}"
309
	cd "${NANO_SRC}"
311
	${NANO_PMAKE} buildworld
310
	${NANO_MAKE} -j ${NANO_NCPU} buildworld
312
	) > ${MAKEOBJDIRPREFIX}/_.bw 2>&1
311
	) > ${MAKEOBJDIRPREFIX}/_.bw 2>&1
313
)
312
)
314
313
Lines 326-332 build_kernel ( ) ( Link Here
326
	# file to override this behavior. Just set NANO_MODULES=default.
325
	# file to override this behavior. Just set NANO_MODULES=default.
327
	set -o xtrace
326
	set -o xtrace
328
	cd "${NANO_SRC}"
327
	cd "${NANO_SRC}"
329
	${NANO_PMAKE} buildkernel
328
	${NANO_MAKE} -j ${NANO_NCPU} buildkernel
330
	) > ${MAKEOBJDIRPREFIX}/_.bk 2>&1
329
	) > ${MAKEOBJDIRPREFIX}/_.bk 2>&1
331
)
330
)
332
331
Lines 843-858 pprint ( ) ( Link Here
843
usage ( ) {
842
usage ( ) {
844
	(
843
	(
845
	echo "Usage: $0 [-bfhiKknqvwX] [-c config_file]"
844
	echo "Usage: $0 [-bfhiKknqvwX] [-c config_file]"
845
	echo "	-B	suppress installs (both kernel and world)"
846
	echo "	-b	suppress builds (both kernel and world)"
846
	echo "	-b	suppress builds (both kernel and world)"
847
	echo "	-c	specify config file"
847
	echo "	-c	specify config file"
848
	echo "	-f	suppress code slice extraction (implies -i)"
848
	echo "	-f	suppress code slice extraction (implies -i)"
849
	echo "	-h	print this help summary page"
849
	echo "	-h	print this help summary page"
850
	echo "	-I	build disk image from existing build/install"
850
	echo "	-i	suppress disk image build"
851
	echo "	-i	suppress disk image build"
851
	echo "	-K	suppress installkernel"
852
	echo "	-K	suppress installkernel"
852
	echo "	-k	suppress buildkernel"
853
	echo "	-k	suppress buildkernel"
853
	echo "	-n	add -DNO_CLEAN to buildworld, buildkernel, etc"
854
	echo "	-n	add -DNO_CLEAN to buildworld, buildkernel, etc"
854
	echo "	-q	make output more quiet"
855
	echo "	-q	make output more quiet"
855
	echo "	-v	make output more verbose"
856
	echo "	-v	make output more verbose"
857
	echo "	-W	suppress installworld"
856
	echo "	-w	suppress buildworld"
858
	echo "	-w	suppress buildworld"
857
	echo "	-X	make native-xtools"
859
	echo "	-X	make native-xtools"
858
	) 1>&2
860
	) 1>&2
Lines 913-919 set_defaults_and_export ( ) { Link Here
913
	export_var NANO_NCPU
915
	export_var NANO_NCPU
914
	export_var NANO_NEWFS
916
	export_var NANO_NEWFS
915
	export_var NANO_OBJ
917
	export_var NANO_OBJ
916
	export_var NANO_PMAKE
917
	export_var NANO_SECTS
918
	export_var NANO_SECTS
918
	export_var NANO_SRC
919
	export_var NANO_SRC
919
	export_var NANO_TOOLS
920
	export_var NANO_TOOLS
(-)b/tools/tools/nanobsd/embedded/common (-3 lines)
Lines 81-88 NANO_RAM_ETCSIZE=8192 Link Here
81
NANO_RAM_TMPVARSIZE=8192
81
NANO_RAM_TMPVARSIZE=8192
82
NANO_IMAGES=2
82
NANO_IMAGES=2
83
83
84
NANO_PMAKE="make -j $(sysctl -n hw.ncpu)"
85
86
NANO_CFG_BASE=$(pwd)
84
NANO_CFG_BASE=$(pwd)
87
NANO_CFG_BASE=$(realpath ${NANO_CFG_BASE}/..)
85
NANO_CFG_BASE=$(realpath ${NANO_CFG_BASE}/..)
88
NANO_SRC=$(realpath ${NANO_CFG_BASE}/../../..)
86
NANO_SRC=$(realpath ${NANO_CFG_BASE}/../../..)
89
- 

Return to bug 277269