Author: n_hibma
Date: Thu Nov 28 08:54:15 2013
New Revision: 258705
URL: http://svnweb.freebsd.org/changeset/base/258705
Log:
Do a parallel buildworld & buildkernel (using NANO_PMAKE), but use a
single threaded installworld, installkernel and distribution (using
NANO_MAKE). Setting NANO_PMAKE to 'make -j 12' would otherwise bomb
during installation of world.
MFC after: 2 weeks
Modified:
head/tools/tools/nanobsd/nanobsd.sh
Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh Thu Nov 28 08:48:49 2013
(r258704)
+++ head/tools/tools/nanobsd/nanobsd.sh Thu Nov 28 08:54:15 2013
(r258705)
@@ -57,7 +57,8 @@ NANO_PACKAGE_LIST="*"
# default is ${NANO_OBJ}
#NANO_DISKIMGDIR=""
-# Parallel Make
+# Make & parallel Make
+NANO_MAKE="make"
NANO_PMAKE="make -j 3"
# The default name for any image we create.
@@ -254,7 +255,7 @@ install_world ( ) (
cd ${NANO_SRC}
env TARGET_ARCH=${NANO_ARCH} \
- ${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} installworld \
+ ${NANO_MAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} installworld \
DESTDIR=${NANO_WORLDDIR} \
> ${NANO_OBJ}/_.iw 2>&1
chflags -R noschg ${NANO_WORLDDIR}
@@ -267,7 +268,7 @@ install_etc ( ) (
cd ${NANO_SRC}
env TARGET_ARCH=${NANO_ARCH} \
- ${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} distribution \
+ ${NANO_MAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} distribution \
DESTDIR=${NANO_WORLDDIR} \
> ${NANO_OBJ}/_.etc 2>&1
# make.conf doesn't get created by default, but some ports need it
@@ -288,7 +289,7 @@ install_kernel ( ) (
fi
cd ${NANO_SRC}
- env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} installkernel \
+ env TARGET_ARCH=${NANO_ARCH} ${NANO_MAKE} installkernel \
DESTDIR=${NANO_WORLDDIR} \
__MAKE_CONF=${NANO_MAKE_CONF_INSTALL} \
${kernconfdir:+"KERNCONFDIR="}${kernconfdir} \
@@ -878,6 +879,7 @@ fi
if $do_clean ; then
true
else
+ NANO_MAKE="${NANO_MAKE} -DNO_CLEAN"
NANO_PMAKE="${NANO_PMAKE} -DNO_CLEAN"
fi
@@ -897,6 +899,7 @@ export NANO_DRIVE
export NANO_HEADS
export NANO_IMAGES
export NANO_IMGNAME
+export NANO_MAKE
export NANO_MAKE_CONF_BUILD
export NANO_MAKE_CONF_INSTALL
export NANO_MEDIASIZE
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
