Author: imp
Date: Wed Nov 16 17:11:05 2016
New Revision: 308736
URL: https://svnweb.freebsd.org/changeset/base/308736
Log:
Allow installworld to be skipped as well as installkernel with -W.
Allow -B to mean -K -W.
There are times when fixing non-base elementes of the build that you
don't want to wait to get a completely clean world install. This
allows that at the cost of a little danger.
Submitted by: gallatin@
Sponsored by: Netflix, Inc
Modified:
head/tools/tools/nanobsd/nanobsd.sh
Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh Wed Nov 16 16:49:21 2016
(r308735)
+++ head/tools/tools/nanobsd/nanobsd.sh Wed Nov 16 17:11:05 2016
(r308736)
@@ -40,6 +40,7 @@ do_clean=true
do_kernel=true
do_installkernel=true
do_world=true
+do_installworld=true
do_image=true
do_copyout_partition=true
do_native_xtools=false
@@ -48,7 +49,7 @@ do_native_xtools=false
do_legacy=false
set +e
-args=`getopt KXbc:fhiknqvw $*`
+args=`getopt BKXWbc:fhiknqvw $*`
if [ $? -ne 0 ] ; then
usage
exit 2
@@ -60,6 +61,11 @@ for i
do
case "$i"
in
+ -B)
+ do_installworld=false
+ do_installkernel=false
+ shift
+ ;;
-K)
do_installkernel=false
shift
@@ -68,6 +74,10 @@ do
do_native_xtools=true
shift
;;
+ -W)
+ do_installworld=false
+ shift
+ ;;
-b)
do_world=false
do_kernel=false
@@ -174,10 +184,15 @@ else
pprint 2 "Skipping buildkernel (as instructed)"
fi
-clean_world
-make_conf_install
-install_world
-install_etc
+if $do_installworld ; then
+ clean_world
+ make_conf_install
+ install_world
+ install_etc
+else
+ pprint 2 "Skipping installworld (as instructed)"
+fi
+
if $do_native_xtools ; then
native_xtools
fi
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
