Date: Sat, 5 Dec 2015 10:16:54 -0700 From: Warner Losh <imp@bsdimp.com> To: Howard Su <howard0su@gmail.com> Cc: Warner Losh <imp@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r291830 - head/tools/tools/nanobsd Message-ID: <B95D4ACE-B00D-4444-843F-A8A99E469EF5@bsdimp.com> In-Reply-To: <CAAvnz_qL7Tqur9AMc9Gj3gG0_9pOUs6jTkCoXoWSV_qA0nrXng@mail.gmail.com> References: <201512050110.tB51A5pO047682@repo.freebsd.org> <CAAvnz_qL7Tqur9AMc9Gj3gG0_9pOUs6jTkCoXoWSV_qA0nrXng@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] > On Dec 5, 2015, at 5:40 AM, Howard Su <howard0su@gmail.com> wrote: > > > > On Saturday, December 5, 2015, Warner Losh <imp@freebsd.org> 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 } Ah, that’s what I get for ‘tidying up’ a couple of things just before the commit and not running a final, final test run :( Fixed. Warner > + 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 [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJWYxwIAAoJEGwc0Sh9sBEAj6kP/2R/Tbz30a5IghPrRBPDJkeN 8DWvdON5n6rPAwOE34ACqtCtMW6FvFrHDEMc55qijq9myZk1HvNpG4DMao+9U3MX FJGPcvyYa0z4xt/idNxcLJndxp57rtOctN5kU8h7Xz2YUFvYT73pR1VQbMhpsch0 U2k2dGreaVEOaOluu109GtViD9McgyRVxbAQ7yi6IVLCAwYPpeoE/H/ietS6o3YQ mK5R8bKocuCCnbLfM55Fh2+/3yHz4pzY+e/Ap6TXpWKxLD9SbvOEI3QfanzlHeJc z6xgvudqNCBJKAettZFblC/c2/YP/P789SlOcOv1A0KQTM2nZGNHozSJNkzBRnu8 azq9Vdtj9StefzDh4TG6G4czhe66VETVXzO3gOBJgdVaISiBZ7rkCNbNI6jqzQ4/ Bl5Cfri9AbMdepSmtMmvV/XkUgEtX6aklkYQ0HqBeyxJsVIF/rLS/6g7i4C5HAZI 2kk0WKUCVJR0LKXHF5mdqZhtEJ/NIMddpv+53Szu57T6z995FGYtGfkdecTGtitE iSRZHp2ZTBooeifArVxiY2X82y3WTg9R221S8v/5QEDR4iWLfx7OGbrin5CLj9Sw sAWWfJcG4Ca7Onap5HkJKRDGGuGETQW9ELa8h3v56t3E8MJ0Wxe7WOXtJJsTAdUv 9FyaJNkK6L4zvVP8a6c1 =pLpO -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?B95D4ACE-B00D-4444-843F-A8A99E469EF5>