svn commit: r206537 - stable/8/tools/tools/nanobsd
Warner Losh
imp at FreeBSD.org
Tue Apr 13 00:57:55 UTC 2010
Author: imp
Date: Tue Apr 13 00:57:54 2010
New Revision: 206537
URL: http://svn.freebsd.org/changeset/base/206537
Log:
MFC 205980:
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:
stable/8/tools/tools/nanobsd/nanobsd.sh
Directory Properties:
stable/8/tools/tools/nanobsd/ (props changed)
Modified: stable/8/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- stable/8/tools/tools/nanobsd/nanobsd.sh Tue Apr 13 00:55:11 2010 (r206536)
+++ stable/8/tools/tools/nanobsd/nanobsd.sh Tue Apr 13 00:57:54 2010 (r206537)
@@ -134,7 +134,7 @@ PPLEVEL=3
#######################################################################
# Not a variable at this time
-NANO_ARCH=i386
+NANO_ARCH=`uname -p`
#######################################################################
#
@@ -238,6 +238,9 @@ install_etc ( ) (
${NANO_PMAKE} __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
+ # so they can spam it.
+ cp /dev/null ${NANO_WORLDDIR}/etc/make.conf
)
install_kernel ( ) (
@@ -497,6 +500,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
More information about the svn-src-stable
mailing list