From 4e6eaf365b803e199edd8c5da38c67b2add2a1ad Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 13 Apr 2010 00:57:54 +0000 Subject: [PATCH] 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 --- tools/tools/nanobsd/nanobsd.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh index 10d8f78b6c9..e50db8bd3b2 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` ####################################################################### # @@ -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