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

Collapse All | Expand All

(-)nanobsd.sh (-3 / +6 lines)
Lines 57-63 Link Here
57
# default is ${NANO_OBJ}
57
# default is ${NANO_OBJ}
58
#NANO_DISKIMGDIR=""
58
#NANO_DISKIMGDIR=""
59
59
60
# Parallel Make
60
# Make & parallel Make
61
NANO_MAKE="make"
61
NANO_PMAKE="make -j 3"
62
NANO_PMAKE="make -j 3"
62
63
63
# The default name for any image we create.
64
# The default name for any image we create.
Lines 254-260 Link Here
254
255
255
	cd ${NANO_SRC}
256
	cd ${NANO_SRC}
256
	env TARGET_ARCH=${NANO_ARCH} \
257
	env TARGET_ARCH=${NANO_ARCH} \
257
	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} installworld \
258
	${NANO_MAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} installworld \
258
		DESTDIR=${NANO_WORLDDIR} \
259
		DESTDIR=${NANO_WORLDDIR} \
259
		> ${NANO_OBJ}/_.iw 2>&1
260
		> ${NANO_OBJ}/_.iw 2>&1
260
	chflags -R noschg ${NANO_WORLDDIR}
261
	chflags -R noschg ${NANO_WORLDDIR}
Lines 267-273 Link Here
267
268
268
	cd ${NANO_SRC}
269
	cd ${NANO_SRC}
269
	env TARGET_ARCH=${NANO_ARCH} \
270
	env TARGET_ARCH=${NANO_ARCH} \
270
	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} distribution \
271
	${NANO_MAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} distribution \
271
		DESTDIR=${NANO_WORLDDIR} \
272
		DESTDIR=${NANO_WORLDDIR} \
272
		> ${NANO_OBJ}/_.etc 2>&1
273
		> ${NANO_OBJ}/_.etc 2>&1
273
	# make.conf doesn't get created by default, but some ports need it
274
	# make.conf doesn't get created by default, but some ports need it
Lines 886-891 Link Here
886
if $do_clean ; then
887
if $do_clean ; then
887
	true
888
	true
888
else
889
else
890
	NANO_MAKE="${NANO_MAKE} -DNO_CLEAN"
889
	NANO_PMAKE="${NANO_PMAKE} -DNO_CLEAN"
891
	NANO_PMAKE="${NANO_PMAKE} -DNO_CLEAN"
890
fi
892
fi
891
893
Lines 905-910 Link Here
905
export NANO_HEADS
907
export NANO_HEADS
906
export NANO_IMAGES
908
export NANO_IMAGES
907
export NANO_IMGNAME
909
export NANO_IMGNAME
910
export NANO_MAKE
908
export NANO_MAKE_CONF_BUILD
911
export NANO_MAKE_CONF_BUILD
909
export NANO_MAKE_CONF_INSTALL
912
export NANO_MAKE_CONF_INSTALL
910
export NANO_MEDIASIZE
913
export NANO_MEDIASIZE

Return to bug 193808