d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC 205980:

Browse Source 
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
This commit is contained in:
Warner Losh 2010-04-13 00:57:54 +00:00
parent 4bbe66c93f
commit 4e6eaf365b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/8/; revision=206537
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/tools/nanobsd/nanobsd.sh
View File

@ -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