From nobody@FreeBSD.org  Sun Sep  4 00:09:49 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 960DA106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  4 Sep 2011 00:09:49 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 7BA548FC18
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  4 Sep 2011 00:09:49 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p8409nxO050784
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 4 Sep 2011 00:09:49 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p8409nvL050783;
	Sun, 4 Sep 2011 00:09:49 GMT
	(envelope-from nobody)
Message-Id: <201109040009.p8409nvL050783@red.freebsd.org>
Date: Sun, 4 Sep 2011 00:09:49 GMT
From: Garrett Cooper <yaneurabeya@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] make nanobsd builds deterministic and add $SRCCONF knob
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         160443
>Category:       misc
>Synopsis:       [nanobsd] [patch] make nanobsd builds deterministic and add $SRCCONF knob
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    imp
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 04 00:10:08 UTC 2011
>Closed-Date:    Fri Mar 14 14:31:29 MDT 2014
>Last-Modified:  Fri Mar 14 14:31:29 MDT 2014
>Originator:     Garrett Cooper
>Release:        9-BETA1
>Organization:
iXsystems, Inc.
>Environment:
FreeBSD fallout.local 9.0-BETA2 FreeBSD 9.0-BETA2 #0 r225239M: Sun Aug 28 22:34:21 PDT 2011     gcooper@fallout.local:/usr/obj/usr/src/sys/FALLOUT  amd64
>Description:
The current incarnation of nanobsd doesn't deal with src.conf properly. In particular, src.conf is included before make.conf, s.t. if SRCCONF is defined in __MAKE_CONF, builds with become non-deterministic and the point of specifying SRCCONF=/dev/null will become null and moot.

The following also adds an environmental knob so people can specify $SRCCONF, if they desire.
>How-To-Repeat:
1. Check out freenas, prior to r7546.
2. echo 'WITHOUT_KERBEROS=' >> /etc/src.conf
3. sh build/do_build.sh

The build will fail with nss_ldap as it requires kerberos support.
>Fix:


Patch attached with submission follows:

Index: tools/tools/nanobsd/nanobsd.sh
===================================================================
--- tools/tools/nanobsd/nanobsd.sh	(revision 224946)
+++ tools/tools/nanobsd/nanobsd.sh	(working copy)
@@ -159,6 +159,10 @@
 # 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}
+
 #######################################################################
 #
 # The functions which do the real work.
@@ -182,7 +186,6 @@
 
 	echo "${CONF_WORLD}" > ${NANO_MAKE_CONF_BUILD}
 	echo "${CONF_BUILD}" >> ${NANO_MAKE_CONF_BUILD}
-	echo "SRCCONF=/dev/null" >> ${NANO_MAKE_CONF_BUILD}
 )
 
 build_world ( ) (
@@ -191,6 +194,7 @@
 
 	cd ${NANO_SRC}
 	env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} \
+		SRCCONF=${SRCCONF} \
 		__MAKE_CONF=${NANO_MAKE_CONF_BUILD} buildworld \
 		> ${MAKEOBJDIRPREFIX}/_.bw 2>&1
 )
@@ -215,9 +219,10 @@
 	# Note: We intentionally build all modules, not only the ones in
 	# NANO_MODULES so the built world can be reused by multiple images.
 	env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} buildkernel \
-		__MAKE_CONF=${NANO_MAKE_CONF_BUILD} \
 		${kernconfdir:+"KERNCONFDIR="}${kernconfdir} \
 		KERNCONF=${kernconf}
+		SRCCONF=${SRCCONF} \
+		__MAKE_CONF=${NANO_MAKE_CONF_BUILD} \
 	) > ${MAKEOBJDIRPREFIX}/_.bk 2>&1
 )
 
@@ -245,7 +250,6 @@
 
 	echo "${CONF_WORLD}" > ${NANO_MAKE_CONF_INSTALL}
 	echo "${CONF_INSTALL}" >> ${NANO_MAKE_CONF_INSTALL}
-	echo "SRCCONF=/dev/null" >> ${NANO_MAKE_CONF_INSTALL}
 )
 
 install_world ( ) (
@@ -256,6 +260,7 @@
 	env TARGET_ARCH=${NANO_ARCH} \
 	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} installworld \
 		DESTDIR=${NANO_WORLDDIR} \
+		SRCCONF=${SRCCONF} \
 		> ${NANO_OBJ}/_.iw 2>&1
 	chflags -R noschg ${NANO_WORLDDIR}
 )
@@ -267,8 +272,10 @@
 
 	cd ${NANO_SRC}
 	env TARGET_ARCH=${NANO_ARCH} \
-	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} distribution \
+	${NANO_PMAKE} distribution \
 		DESTDIR=${NANO_WORLDDIR} \
+		SRCCONF=${SRCCONF} \
+		__MAKE_CONF=${NANO_MAKE_CONF_INSTALL} \
 		> ${NANO_OBJ}/_.etc 2>&1
 	# make.conf doesn't get created by default, but some ports need it
 	# so they can spam it.
@@ -290,10 +297,11 @@
 	cd ${NANO_SRC}
 	env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} installkernel \
 		DESTDIR=${NANO_WORLDDIR} \
-		__MAKE_CONF=${NANO_MAKE_CONF_INSTALL} \
 		${kernconfdir:+"KERNCONFDIR="}${kernconfdir} \
 		KERNCONF=${kernconf} \
 		MODULES_OVERRIDE="${NANO_MODULES}"
+		SRCCONF=${SRCCONF} \
+		__MAKE_CONF=${NANO_MAKE_CONF_INSTALL} \
 	) > ${NANO_OBJ}/_.ik 2>&1
 )
 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->imp 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sun Sep 4 06:22:10 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160443 

From: Garrett Cooper <yaneurabeya@gmail.com>
To: bug-followup@FreeBSD.org, gcooper@ixsystems.com
Cc:  
Subject: Re: kern/160443: [nanobsd] [patch] make nanobsd builds deterministic
 and add $SRCCONF knob
Date: Wed, 26 Oct 2011 16:22:31 -0700

 Ping? We've been using this patch at iX for almost 2 months without
 issue, so I think it could and should be committed.
 -Garrett

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/160443: commit references a PR
Date: Fri, 14 Mar 2014 20:20:49 +0000 (UTC)

 Author: imp
 Date: Fri Mar 14 20:20:36 2014
 New Revision: 263190
 URL: http://svnweb.freebsd.org/changeset/base/263190
 
 Log:
   Be more explicit about setting SRCCONF to /dev/null (plus allow it to
   be overridden).
   
   PR: 160443
   Submitted by: Garrett Cooper
 
 Modified:
   head/tools/tools/nanobsd/nanobsd.sh
 
 Modified: head/tools/tools/nanobsd/nanobsd.sh
 ==============================================================================
 --- head/tools/tools/nanobsd/nanobsd.sh	Fri Mar 14 20:20:32 2014	(r263189)
 +++ head/tools/tools/nanobsd/nanobsd.sh	Fri Mar 14 20:20:36 2014	(r263190)
 @@ -163,6 +163,10 @@ 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}
 + 
  #######################################################################
  #
  # The functions which do the real work.
 @@ -193,7 +197,6 @@ make_conf_build ( ) (
  
  	echo "${CONF_WORLD}" > ${NANO_MAKE_CONF_BUILD}
  	echo "${CONF_BUILD}" >> ${NANO_MAKE_CONF_BUILD}
 -	echo "SRCCONF=/dev/null" >> ${NANO_MAKE_CONF_BUILD}
  )
  
  build_world ( ) (
 @@ -202,6 +205,7 @@ build_world ( ) (
  
  	cd ${NANO_SRC}
  	env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} \
 +		SRCCONF=${SRCCONF} \
  		__MAKE_CONF=${NANO_MAKE_CONF_BUILD} buildworld \
  		> ${MAKEOBJDIRPREFIX}/_.bw 2>&1
  )
 @@ -228,6 +232,7 @@ build_kernel ( ) (
  	# Note: We intentionally build all modules, not only the ones in
  	# NANO_MODULES so the built world can be reused by multiple images.
  	env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} buildkernel \
 +		SRCCONF=${SRCCONF} \
  		${extra} __MAKE_CONF=${NANO_MAKE_CONF_BUILD} \
  		KERNCONF=${kernconf}
  	) > ${MAKEOBJDIRPREFIX}/_.bk 2>&1
 @@ -257,7 +262,6 @@ make_conf_install ( ) (
  
  	echo "${CONF_WORLD}" > ${NANO_MAKE_CONF_INSTALL}
  	echo "${CONF_INSTALL}" >> ${NANO_MAKE_CONF_INSTALL}
 -	echo "SRCCONF=/dev/null" >> ${NANO_MAKE_CONF_INSTALL}
  )
  
  install_world ( ) (
 @@ -266,7 +270,8 @@ install_world ( ) (
  
  	cd ${NANO_SRC}
  	env TARGET_ARCH=${NANO_ARCH} \
 -	${NANO_MAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} installworld \
 +	${NANO_MAKE} SRCCONF=${SRCCONF} \
 +		__MAKE_CONF=${NANO_MAKE_CONF_INSTALL} installworld \
  		DESTDIR=${NANO_WORLDDIR} \
  		> ${NANO_OBJ}/_.iw 2>&1
  	chflags -R noschg ${NANO_WORLDDIR}
 @@ -279,7 +284,8 @@ install_etc ( ) (
  
  	cd ${NANO_SRC}
  	env TARGET_ARCH=${NANO_ARCH} \
 -	${NANO_MAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} distribution \
 +	${NANO_MAKE} SRCCONF=${SRCCONF} \
 +		__MAKE_CONF=${NANO_MAKE_CONF_INSTALL} distribution \
  		DESTDIR=${NANO_WORLDDIR} \
  		> ${NANO_OBJ}/_.etc 2>&1
  	# make.conf doesn't get created by default, but some ports need it
 @@ -304,6 +310,7 @@ install_kernel ( ) (
  	cd ${NANO_SRC}
  	env TARGET_ARCH=${NANO_ARCH} ${NANO_MAKE} installkernel \
  		DESTDIR=${NANO_WORLDDIR} \
 +		SRCCONF=${SRCCONF} \
  		${extra} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} \
  		KERNCONF=${kernconf} \
  		MODULES_OVERRIDE="${NANO_MODULES}"
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: imp 
State-Changed-When: Fri Mar 14 14:31:18 MDT 2014 
State-Changed-Why:  
Now in tree. Thanks! 


http://www.freebsd.org/cgi/query-pr.cgi?pr=160443 
>Unformatted:
