svn commit: r206539 - stable/8/tools/tools/nanobsd/gateworks

[Warner Losh]

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()
 {