From owner-svn-src-head@freebsd.org Sat Dec 5 17:17:00 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 EE738A42FF5 for ; Sat, 5 Dec 2015 17:16:59 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-oi0-x22b.google.com (mail-oi0-x22b.google.com [IPv6:2607:f8b0:4003:c06::22b]) (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 A410115FD for ; Sat, 5 Dec 2015 17:16:59 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: by oiww189 with SMTP id w189so81402362oiw.3 for ; Sat, 05 Dec 2015 09:16:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=sender:subject:mime-version:content-type:from:in-reply-to:date:cc :message-id:references:to; bh=qkuQE74j/B+9th3Ir03ripFcaWQ9rgUQ1YLgGKy16ko=; b=XzzZwC/9zyBlJnCGx8+GS7uZTT2BxS5RdG2NBiEfEolZdTnQP07osemwOh7p1LM31M q//JoC8EcGGRtFCjx8uaEQZHJbgejhCTXwiG8WJhWC7HIvWGsvf3jGW3H7tXCaKc9FBt ASlTj6JIuHi3OLJWm5D7QsTkhOnL2nqNpG5pXxEDuiohS0Zrpsd3MUXSwjapN8BS2dsy 3Kvn5g34i87A2xtZv+G8+2xC7bsA3yR21BfzlwKyifRYt/hq+N7iJ3eZD/u1652gKPT2 PSkpm3c3y/yLWUv417e6g8yuNUG1U49AgJEIcoTjxxZWtt3oM+JUEUGyHS16tXdUEvEN N4Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:mime-version:content-type:from :in-reply-to:date:cc:message-id:references:to; bh=qkuQE74j/B+9th3Ir03ripFcaWQ9rgUQ1YLgGKy16ko=; b=AcrUTQV4YJChio73MXtpbAsebMS5p7jux2ATu1FMn8eAeGDAmfESLh4GRprHXbtUPO Dp5AKj+E81hBNwWKIG4SVfgBfL+7XkcXfNidM5cGL+Cx/c5/GRaIwMPhC/rAaH+GeoJx 4Pk/qL4pw/WFYbs17xIKZJiKashjjnuyKHrMeIbzniTim1npK0mBcJUo0rYtWt6b4vs3 2A0079R3KwnPhdRm3TRaoMHe8tiykpsjqPVP2nrr+uzBYqT6hNFEAZ72xSrWqGaOtTe3 9aafFLYK3AeoQOaA25Cy6iCQoX8PBdELWiHMK9iwFjjnVtKKyaKDDyR1by3cV7H+Ipor FZUA== X-Gm-Message-State: ALoCoQkuG8BQHOhUKoVu5mw6B3qoZKDkp2WqSmJx8izjb1GRPq3hXAeG/52qaqoc+D/gn4NMcRw4 X-Received: by 10.202.81.73 with SMTP id f70mr6651741oib.34.1449335818491; Sat, 05 Dec 2015 09:16:58 -0800 (PST) Received: from ?IPv6:2601:280:4900:3700:9562:9bd6:31bc:dd06? ([2601:280:4900:3700:9562:9bd6:31bc:dd06]) by smtp.gmail.com with ESMTPSA id kw1sm8141602obb.28.2015.12.05.09.16.57 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 Dec 2015 09:16:58 -0800 (PST) Sender: Warner Losh Subject: Re: svn commit: r291830 - head/tools/tools/nanobsd Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Content-Type: multipart/signed; boundary="Apple-Mail=_F8A54E2E-6C6D-42F9-959E-5D18457F1ABE"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5.2 From: Warner Losh In-Reply-To: Date: Sat, 5 Dec 2015 10:16:54 -0700 Cc: Warner Losh , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-Id: References: <201512050110.tB51A5pO047682@repo.freebsd.org> To: Howard Su X-Mailer: Apple Mail (2.2104) 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 17:17:00 -0000 --Apple-Mail=_F8A54E2E-6C6D-42F9-959E-5D18457F1ABE Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Dec 5, 2015, at 5:40 AM, Howard Su wrote: >=20 >=20 >=20 > 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 >=20 > Log: > Setting NANO_NOPRIV_BUILD will now add -DNO_ROOT and METALOG=3Dxxxx = 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. >=20 > Modified: > head/tools/tools/nanobsd/defaults.sh (contents, props changed) >=20 > Modified: head/tools/tools/nanobsd/defaults.sh > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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=3Dt > + echo METALOG=3D${NANO_METALOG} > + fi > ) > ${NANO_MAKE_CONF_INSTALL} > ) >=20 > @@ -951,11 +955,14 @@ set_defaults_and_export ( ) { > NANO_MAKE_CONF_INSTALL=3D${NANO_OBJ}/make.conf.install >=20 > # Override user's NANO_DRIVE if they specified a NANO_LABEL > - [ ! -z "${NANO_LABEL}" ] && NANO_DRIVE=3D"ufs/${NANO_LABEL}" > + [ ! -z "${NANO_LABEL}" ] && NANO_DRIVE=3D"ufs/${NANO_LABEL}" = || true >=20 > # Set a default NANO_TOOLS to NANO_SRC/NANO_TOOLS if it = exists. > [ ! -d "${NANO_TOOLS}" ] && [ -d "${NANO_SRC}/${NANO_TOOLS}" ] = && \ > - NANO_TOOLS=3D"${NANO_SRC}/${NANO_TOOLS}" > + NANO_TOOLS=3D"${NANO_SRC}/${NANO_TOOLS}" || true > + > + [ ! -z "${NANO_NOPRIV_BUILD" ] && [ -z "${NANO_METALOG}"] && \ > ^ = missing } Ah, that=E2=80=99s what I get for =E2=80=98tidying up=E2=80=99 a couple = of things just before the commit and not running a final, final test run :( Fixed. Warner > + NANO_METALOG=3D${NANO_OBJ}/_.metalog || true >=20 > NANO_STARTTIME=3D`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" >=20 >=20 > -- > -Howard --Apple-Mail=_F8A54E2E-6C6D-42F9-959E-5D18457F1ABE Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----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----- --Apple-Mail=_F8A54E2E-6C6D-42F9-959E-5D18457F1ABE--