summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-03-31 14:42:07 +0000
committerimp <imp@FreeBSD.org>2010-03-31 14:42:07 +0000
commit968dcf13b528f2bef0c89a258be580e007730e6a (patch)
tree896bc7a6b5efd56bae1c0120efaa430035bf5e54 /tools
parent8c1c218daaedd7250c61085c299eb2efbb11d3ce (diff)
downloadFreeBSD-src-968dcf13b528f2bef0c89a258be580e007730e6a.zip
FreeBSD-src-968dcf13b528f2bef0c89a258be580e007730e6a.tar.gz
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
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/nanobsd/nanobsd.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
index 10d8f78..77e666c 100644
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -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
OpenPOWER on IntegriCloud