From owner-svn-src-stable@FreeBSD.ORG  Tue Apr 13 01:04:11 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7C96C106564A;
	Tue, 13 Apr 2010 01:04:11 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6AFF28FC12;
	Tue, 13 Apr 2010 01:04:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3D14BO0095154;
	Tue, 13 Apr 2010 01:04:11 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3D14BJt095151;
	Tue, 13 Apr 2010 01:04:11 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201004130104.o3D14BJt095151@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 13 Apr 2010 01:04:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206539 - stable/8/tools/tools/nanobsd/gateworks
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Apr 2010 01:04:11 -0000

Author: imp
Date: Tue Apr 13 01:04:11 2010
New Revision: 206539
URL: http://svn.freebsd.org/changeset/base/206539

Log:
  MFC: 205994
  
    Two fixes:
  
    (1) We don't need a custom install_kernel.  We can install without
    symbols by adding INSTALL_NODEBUG (which likely should be
    WITHOUT_KERNEL_SYMBOLS_FILE, or something shorter) to CONF_INSTALL
    (2) for make buildenv stage, use NANO_MAKE_CONF_BUILD rather than the
    non-existant NANO_MAKE_CONF.
  
    MFC after:	7 days

Modified:
  stable/8/tools/tools/nanobsd/gateworks/common
Directory Properties:
  stable/8/tools/tools/nanobsd/   (props changed)

Modified: stable/8/tools/tools/nanobsd/gateworks/common
==============================================================================
--- stable/8/tools/tools/nanobsd/gateworks/common	Tue Apr 13 01:02:20 2010	(r206538)
+++ stable/8/tools/tools/nanobsd/gateworks/common	Tue Apr 13 01:04:11 2010	(r206539)
@@ -37,7 +37,7 @@ NANO_CUSTOMIZE="$NANO_CUSTOMIZE cust_ins
 buildenv()
 {
 	cd ${NANO_SRC}
-	env TARGET_ARCH=${NANO_ARCH} __MAKE_CONF=${NANO_MAKE_CONF} \
+	env TARGET_ARCH=${NANO_ARCH} __MAKE_CONF=${NANO_MAKE_CONF_BUILD} \
 	    DESTDIR=${NANO_WORLDDIR} make buildenv
 }
 
@@ -146,22 +146,9 @@ WITHOUT_TCSH=true
 CONF_INSTALL="$CONF_BUILD
 WITHOUT_TOOLCHAIN=true
 WITHOUT_INSTALLLIB=true
+INSTALL_NODEBUG=true
 "
 
-# NB: override to suppress install of kernel.symbols
-install_kernel()
-{
-	pprint 2 "install kernel"
-	pprint 3 "log: ${MAKEOBJDIRPREFIX}/_.ik"
-
-	cd ${NANO_SRC}
-	env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} installkernel \
-		INSTALL_NODEBUG=true \
-		DESTDIR=${NANO_WORLDDIR} \
-		__MAKE_CONF=${NANO_MAKE_CONF} KERNCONF=`basename ${NANO_KERNEL}` \
-		> ${MAKEOBJDIRPREFIX}/_.ik 2>&1
-}
-
 # NB: override to force / on s1 instead of s1a
 setup_nanobsd_etc()
 {