From owner-svn-src-all@freebsd.org Sat Dec 5 00:54:44 2015 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 9B926A41AC3; Sat, 5 Dec 2015 00:54:44 +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 415571502; Sat, 5 Dec 2015 00:54:44 +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 tB50shh9043454; Sat, 5 Dec 2015 00:54:43 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB50shWE043453; Sat, 5 Dec 2015 00:54:43 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201512050054.tB50shWE043453@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 5 Dec 2015 00:54:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291829 - 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.20 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: Sat, 05 Dec 2015 00:54:44 -0000 Author: imp Date: Sat Dec 5 00:54:43 2015 New Revision: 291829 URL: https://svnweb.freebsd.org/changeset/base/291829 Log: SRCCONF makes no sense in make.conf. Don't set it there. Rely on it being in the environment. Also filter out the new SRC_ENV_CONF as well. If you really need these set, set them in your config file, not in the build environment used to launch nanobsd. Pointed out by: bdrewery@ 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:15:04 2015 (r291828) +++ head/tools/tools/nanobsd/defaults.sh Sat Dec 5 00:54:43 2015 (r291829) @@ -164,7 +164,6 @@ NANO_SLICE_DATA=s4 # conflates the two, so architectures where TARGET != TARGET_ARCH and # TARGET can't be guessed from TARGET_ARCH do not work. This defaults # to the arch of the current machine. - NANO_ARCH=`uname -p` # CPUTYPE defaults to "" which is the default when CPUTYPE isn't @@ -177,9 +176,12 @@ NANO_CFGDIR="" # Directory to populate /data from NANO_DATADIR="" -# src.conf to use when building the image. Defaults to /dev/null for the sake -# of determinism. -SRCCONF=${SRCCONF:=/dev/null} +# We don't need SRCCONF or SRC_ENV_CONF. NanoBSD puts everything we +# need for the build in files included with __MAKE_CONF. Override in your +# config file if you really must. We set them unconditionally here, though +# in case they are stray in the build environment +SRCCONF=/dev/null +SRC_ENV_CONF=/dev/null ####################################################################### # @@ -224,9 +226,8 @@ nano_make_kernel_env ( ) { } nano_global_make_env ( ) ( - [ ! -z "${NANO_ARCH}" ] && echo TARGET_ARCH="${NANO_ARCH}" - [ ! -z "${NANO_CPUTYPE}" ] && echo TARGET_CPUTYPE="${NANO_CPUTYPE}" - echo SRCCONF=${SRCCONF} + [ ! -z "${NANO_ARCH}" ] && echo TARGET_ARCH="${NANO_ARCH}" || true + [ ! -z "${NANO_CPUTYPE}" ] && echo TARGET_CPUTYPE="${NANO_CPUTYPE}" || true ) # rm doesn't know -x prior to FreeBSD 10, so cope with a variety of build @@ -985,4 +986,5 @@ set_defaults_and_export ( ) { export_var NANO_LABEL export_var NANO_MODULES export_var SRCCONF + export_var SRC_ENV_CONF }