Author: thomas
Date: Fri Sep 26 19:13:13 2014
New Revision: 272184
URL: http://svnweb.freebsd.org/changeset/base/272184
Log:
MFC rev. 258705 to stable/9:
Define NANO_MAKE (single threaded MAKE) and use it for installworld,
installkernel, and distribution.
Required in order to fix regression introduced by MFC rev. 265894
for kern/162736, since that change depends on this one.
PR: 193808
Modified:
stable/9/tools/tools/nanobsd/nanobsd.sh
Modified: stable/9/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- stable/9/tools/tools/nanobsd/nanobsd.sh Fri Sep 26 18:53:00 2014
(r272183)
+++ stable/9/tools/tools/nanobsd/nanobsd.sh Fri Sep 26 19:13:13 2014
(r272184)
@@ -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
@@ -886,6 +887,7 @@ fi
if $do_clean ; then
true
else
+ NANO_MAKE="${NANO_MAKE} -DNO_CLEAN"
NANO_PMAKE="${NANO_PMAKE} -DNO_CLEAN"
fi
@@ -905,6 +907,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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
