From 556de497fa727d9f614124be0981a335aa89373f Mon Sep 17 00:00:00 2001
From: Remko Lodder <remko@FreeBSD.org>
Date: Sat, 20 Jun 2009 20:35:50 +0000
Subject: [PATCH] Add architecture support for TinyBSD

PR:		135301
Submitted by:	Olivier Cochard-Labbe <olivier at cochard dot me>
Reviewed by:	Jean Milanez Melo <jmelo at freebsdbrasil dot com dot br> (maintainer)
Approved by:	imp (mentor, implicit)
MFC after:	1 week
---
 tools/tools/tinybsd/tinybsd | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/tools/tinybsd/tinybsd b/tools/tools/tinybsd/tinybsd
index 912a7974ac96..0f333f7b5745 100755
--- a/tools/tools/tinybsd/tinybsd
+++ b/tools/tools/tinybsd/tinybsd
@@ -19,6 +19,8 @@ BASEFILE="tinybsd.basefiles"
 PORTSFILE="tinybsd.ports"
 PORTSDIR=/usr/ports
 DEFINSTARGS="-o 0 -g 0 -m 555"
+TINYARCH=$(uname -p)
+
 TS="=====>"
 
 splitarg1 () {
@@ -331,7 +333,7 @@ install_ports() {
 
 make_kernel() {
 	echo "${TS} Building customized tiny beastie kernel... "
-	cp -p ${CURRENTDIR}/conf/${CONF}/${KERNCONF} /usr/src/sys/i386/conf
+	cp -p ${CURRENTDIR}/conf/${CONF}/${KERNCONF} /usr/src/sys/${TINYARCH}/conf
 	cd /usr/src
 	make buildkernel KERNCONF=${KERNCONF} || exit 1
 	gzip -9 /usr/obj/usr/src/sys/${KERNCONF}/kernel
@@ -339,7 +341,7 @@ make_kernel() {
 	install ${DEFINSTARGS} \
 	  /usr/obj/usr/src/sys/${KERNCONF}/modules/usr/src/sys/modules/acpi/acpi/acpi.ko \
 	    ${WORKDIR}/boot/kernel
-	install -o 0 -g 0 -m 444 /sys/i386/conf/GENERIC.hints ${WORKDIR}/boot/device.hints
+	install -o 0 -g 0 -m 444 /sys/${TINYARCH}/conf/GENERIC.hints ${WORKDIR}/boot/device.hints
 }
 
 copy_libraries() {