From owner-svn-src-all@freebsd.org Wed Nov 16 17:11:06 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA53DC4580C; Wed, 16 Nov 2016 17:11:06 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8551A14F0; Wed, 16 Nov 2016 17:11:06 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAGHB5lL043636; Wed, 16 Nov 2016 17:11:05 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAGHB5LF043635; Wed, 16 Nov 2016 17:11:05 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201611161711.uAGHB5LF043635@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 16 Nov 2016 17:11:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r308736 - head/tools/tools/nanobsd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Nov 2016 17:11:06 -0000 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