svn commit: r205980 - head/tools/tools/nanobsd

[Warner Losh]

Author: imp
Date: Wed Mar 31 14:42:07 2010
New Revision: 205980
URL: http://svn.freebsd.org/changeset/base/205980

Log:
  Stop hard coding i386 as the arch for the build.  Instead, default to the
  processor we're running on.  Also, supply amd64 version of create_diskimage
  that's the same as i386's.
  
  # didn't fix the confusion between using the processor for this and using
  # the machine (which would be more appropriate).  NANO_ARCH smashes the two
  # together right now.
  
  MFC after:	7 days

Modified:
  head/tools/tools/nanobsd/nanobsd.sh

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh	Wed Mar 31 13:51:31 2010	(r205979)
+++ head/tools/tools/nanobsd/nanobsd.sh	Wed Mar 31 14:42:07 2010	(r205980)
@@ -134,7 +134,7 @@ PPLEVEL=3
 #######################################################################
 # Not a variable at this time
 
-NANO_ARCH=i386
+NANO_ARCH=`uname -p`
 
 #######################################################################
 #
@@ -497,6 +497,11 @@ create_i386_diskimage ( ) (
 	) > ${NANO_OBJ}/_.di 2>&1
 )
 
+# i386 and amd64 are identical for disk images
+create_amd64_diskimage ( ) (
+	create_i386_diskimage
+)
+
 last_orders () (
 	# Redefine this function with any last orders you may have
 	# after the build completed, for instance to copy the finished