From owner-svn-src-head@freebsd.org Sat Dec 5 12:40:44 2015 Return-Path: Delivered-To: svn-src-head@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 2C4C5A406E8; Sat, 5 Dec 2015 12:40:44 +0000 (UTC) (envelope-from howard0su@gmail.com) Received: from mail-io0-x231.google.com (mail-io0-x231.google.com [IPv6:2607:f8b0:4001:c06::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 074711378; Sat, 5 Dec 2015 12:40:43 +0000 (UTC) (envelope-from howard0su@gmail.com) Received: by iofh3 with SMTP id h3so142163241iof.3; Sat, 05 Dec 2015 04:40:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=PDQxj1ZY81fHUPa506+/qZ0MRKxPkHigTMPlSpWAizU=; b=URJ3aVB/Jf2xRrk8E/M1mgV443/q3p5oUwWrHVbjDSYEi3KhWBP0gRJvc/E5kSbwG8 IX8BbHA8vCxPejvDF9/oXKfZZRAbDFweGl+fIGeKnjn7n1bAT4OM8D/yzt6jC11NGzAz q0WcDbwj0QJ4iXM5o9jM4rhHAzlaQLZ9bQwRXNo60d/rQva92dY2eTrwrVQ5cDPevAbG NibO5/OgJdMBT/yhtDAGccyqPp9x2R+yoXb1pdjN+HaorcfN44U9qs1lmEqlaecnC3cw nb0rmLDXf+LJCmi2vS00O42+dMN+iZqp1wQEGr+SYSRecy3n/5Y+o/mRrSexwmsnum5E MxbQ== MIME-Version: 1.0 X-Received: by 10.107.164.24 with SMTP id n24mr18732959ioe.21.1449319243103; Sat, 05 Dec 2015 04:40:43 -0800 (PST) Received: by 10.107.164.167 with HTTP; Sat, 5 Dec 2015 04:40:43 -0800 (PST) In-Reply-To: <201512050110.tB51A5pO047682@repo.freebsd.org> References: <201512050110.tB51A5pO047682@repo.freebsd.org> Date: Sat, 5 Dec 2015 20:40:43 +0800 Message-ID: Subject: Re: svn commit: r291830 - head/tools/tools/nanobsd From: Howard Su To: Warner Losh Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Dec 2015 12:40:44 -0000 On Saturday, December 5, 2015, Warner Losh wrote: > Author: imp > Date: Sat Dec 5 01:10:04 2015 > New Revision: 291830 > URL: https://svnweb.freebsd.org/changeset/base/291830 > > Log: > Setting NANO_NOPRIV_BUILD will now add -DNO_ROOT and METALOG=xxxx as > appropriate. First step in supporting a build w/o root. More to > follow as actions by customization scripts are not (yet) recorded in > the metalog, and duplicate entries in it aren't removed. > > Modified: > head/tools/tools/nanobsd/defaults.sh (contents, props changed) > > Modified: head/tools/tools/nanobsd/defaults.sh > > ============================================================================== > --- head/tools/tools/nanobsd/defaults.sh Sat Dec 5 00:54:43 2015 > (r291829) > +++ head/tools/tools/nanobsd/defaults.sh Sat Dec 5 01:10:04 2015 > (r291830) > @@ -340,6 +340,10 @@ make_conf_install ( ) ( > nano_global_make_env > echo "${CONF_WORLD}" > echo "${CONF_INSTALL}" > + if [ ! -z "${NANO_NOPRIV_BUILD}" ]; then > + echo NO_ROOT=t > + echo METALOG=${NANO_METALOG} > + fi > ) > ${NANO_MAKE_CONF_INSTALL} > ) > > @@ -951,11 +955,14 @@ set_defaults_and_export ( ) { > NANO_MAKE_CONF_INSTALL=${NANO_OBJ}/make.conf.install > > # Override user's NANO_DRIVE if they specified a NANO_LABEL > - [ ! -z "${NANO_LABEL}" ] && NANO_DRIVE="ufs/${NANO_LABEL}" > + [ ! -z "${NANO_LABEL}" ] && NANO_DRIVE="ufs/${NANO_LABEL}" || true > > # Set a default NANO_TOOLS to NANO_SRC/NANO_TOOLS if it exists. > [ ! -d "${NANO_TOOLS}" ] && [ -d "${NANO_SRC}/${NANO_TOOLS}" ] && \ > - NANO_TOOLS="${NANO_SRC}/${NANO_TOOLS}" > + NANO_TOOLS="${NANO_SRC}/${NANO_TOOLS}" || true > + > + [ ! -z "${NANO_NOPRIV_BUILD" ] && [ -z "${NANO_METALOG}"] && \ > ^ missing } > + NANO_METALOG=${NANO_OBJ}/_.metalog || true > > NANO_STARTTIME=`date +%s` > pprint 3 "Exporting NanoBSD variables" > @@ -985,6 +992,8 @@ set_defaults_and_export ( ) { > export_var NANO_BOOTLOADER > export_var NANO_LABEL > export_var NANO_MODULES > + export_var NANO_NOPRIV_BUILD > + export_var NANO_METALOG > export_var SRCCONF > export_var SRC_ENV_CONF > } > _______________________________________________ > 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-unsubscribe@freebsd.org > " > -- -Howard