Date: Sat, 5 Dec 2015 01:10:05 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291830 - head/tools/tools/nanobsd Message-ID: <201512050110.tB51A5pO047682@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}"] && \ + 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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512050110.tB51A5pO047682>