misc/135301: Patch for fix architecture support for tinybsd script

[Olivier Cochard-Labbé]

>Number:         135301
>Category:       misc
>Synopsis:       Patch for fix architecture support for tinybsd script
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 05 20:40:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Cochard-Labbé
>Release:        FreeBSD current amd64
>Organization:
>Environment:
FreeBSD d630.freenas.org 8.0-CURRENT FreeBSD 8.0-CURRENT #31: Mon Jun  1 08:05:44 CEST 2009     root at d630.freenas.org:/usr/obj/usr/src/sys/DellD630  amd64

>Description:
I'm trying to use TinyBSD under my FreeBSD-amd64-current, but I had this problem:

=====> Building customized tiny beastie kernel... 
+ cp -p /usr/src/tools/tools/tinybsd/conf/FreeNOS/TINYBSD /usr/src/sys/i386/conf
+ cd /usr/src
+ make buildkernel KERNCONF=TINYBSD
ERROR: Missing kernel configuration file(s) (TINYBSD).
*** Error code 1

This error is triggered because I'm using FreeBSD amd64 and no i386, then the configuration need to be copied on /usr/src/sys/amd64/conf.

Here is a patch for adding "arch" variable support to tinybsd.
>How-To-Repeat:
Using tinybsd under FreeBSD-amd64 (or other than i386)
>Fix:
Using the patch file joined.

Patch attached with submission follows:

*** tinybsd.orig	2009-06-05 22:02:53.000000000 +0200
--- tinybsd	2009-06-05 22:05:25.000000000 +0200
***************
*** 17,26 ****
--- 17,28 ----
  KERNCONF=TINYBSD
  BASEFILE="tinybsd.basefiles"
  PORTSFILE="tinybsd.ports"
  PORTSDIR=/usr/ports
  DEFINSTARGS="-o 0 -g 0 -m 555"
+ TINYARCH=$(uname -p)
+ 
  TS="=====>"
  
  splitarg1 () {
     local IFS
     IFS='='
***************
*** 329,347 ****
  	done
  }
  
  make_kernel() {
  	echo "${TS} Building customized tiny beastie kernel... "
! 	cp -p ${CURRENTDIR}/conf/${CONF}/${KERNCONF} /usr/src/sys/i386/conf
  	cd /usr/src
  	make buildkernel KERNCONF=${KERNCONF} || exit 1
  	gzip -9 /usr/obj/usr/src/sys/${KERNCONF}/kernel
  	install ${DEFINSTARGS} /usr/obj/usr/src/sys/${KERNCONF}/kernel.gz ${WORKDIR}/boot/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
  }
  
  copy_libraries() {
  	TDEPFILE="`mktemp -t deps`"
  	TDEPFILES="`mktemp -t depsymlnk`"
--- 331,349 ----
  	done
  }
  
  make_kernel() {
  	echo "${TS} Building customized tiny beastie kernel... "
! 	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
  	install ${DEFINSTARGS} /usr/obj/usr/src/sys/${KERNCONF}/kernel.gz ${WORKDIR}/boot/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/${TINYARCH}/conf/GENERIC.hints ${WORKDIR}/boot/device.hints
  }
  
  copy_libraries() {
  	TDEPFILE="`mktemp -t deps`"
  	TDEPFILES="`mktemp -t depsymlnk`"


>Release-Note:
>Audit-Trail:
>Unformatted: