From nobody@FreeBSD.org  Fri Jun  5 20:33:06 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3E26D106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  5 Jun 2009 20:33:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 127F48FC1D
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  5 Jun 2009 20:33:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n55KX5J1022208
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 5 Jun 2009 20:33:05 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n55KX5ZC022207;
	Fri, 5 Jun 2009 20:33:05 GMT
	(envelope-from nobody)
Message-Id: <200906052033.n55KX5ZC022207@www.freebsd.org>
Date: Fri, 5 Jun 2009 20:33:05 GMT
From: Olivier Cochard-Labb <olivier@cochard.me>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Patch for fix architecture support for tinybsd script
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         135301
>Category:       misc
>Synopsis:       [tinybsd] [patch] Patch for fix architecture support for tinybsd script
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    remko
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 05 20:40:02 UTC 2009
>Closed-Date:    Fri Jan 28 06:56:05 UTC 2011
>Last-Modified:  Fri Jan 28 06:56:05 UTC 2011
>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@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:
Responsible-Changed-From-To: freebsd-bugs->freebsd-embedded 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Fri Jun 5 21:43:40 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135301 
State-Changed-From-To: open->patched 
State-Changed-By: remko 
State-Changed-When: Sat Jun 20 20:36:15 UTC 2009 
State-Changed-Why:  
Grab, committed to -HEAD 


Responsible-Changed-From-To: freebsd-embedded->remko 
Responsible-Changed-By: remko 
Responsible-Changed-When: Sat Jun 20 20:36:15 UTC 2009 
Responsible-Changed-Why:  
Grab, committed to -HEAD 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135301 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/135301: commit references a PR
Date: Sat, 20 Jun 2009 20:36:00 +0000 (UTC)

 Author: remko
 Date: Sat Jun 20 20:35:50 2009
 New Revision: 194558
 URL: http://svn.freebsd.org/changeset/base/194558
 
 Log:
   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
 
 Modified:
   head/tools/tools/tinybsd/tinybsd
 
 Modified: head/tools/tools/tinybsd/tinybsd
 ==============================================================================
 --- head/tools/tools/tinybsd/tinybsd	Sat Jun 20 20:35:42 2009	(r194557)
 +++ head/tools/tools/tinybsd/tinybsd	Sat Jun 20 20:35:50 2009	(r194558)
 @@ -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() {
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/135301: commit references a PR
Date: Thu, 27 Jan 2011 20:39:25 +0000 (UTC)

 Author: remko
 Date: Thu Jan 27 20:39:19 2011
 New Revision: 217978
 URL: http://svn.freebsd.org/changeset/base/217978
 
 Log:
   MFC r194558
   
   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
   
   PR:		135301
 
 Modified:
   stable/7/tools/tools/tinybsd/tinybsd
 Directory Properties:
   stable/7/tools/tools/tinybsd/   (props changed)
 
 Modified: stable/7/tools/tools/tinybsd/tinybsd
 ==============================================================================
 --- stable/7/tools/tools/tinybsd/tinybsd	Thu Jan 27 20:12:35 2011	(r217977)
 +++ stable/7/tools/tools/tinybsd/tinybsd	Thu Jan 27 20:39:19 2011	(r217978)
 @@ -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() {
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/135301: commit references a PR
Date: Thu, 27 Jan 2011 20:39:26 +0000 (UTC)

 Author: remko
 Date: Thu Jan 27 20:39:19 2011
 New Revision: 217978
 URL: http://svn.freebsd.org/changeset/base/217978
 
 Log:
   MFC r194558
   
   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
   
   PR:		135301
 
 Modified:
   stable/7/tools/tools/tinybsd/tinybsd
 Directory Properties:
   stable/7/tools/tools/tinybsd/   (props changed)
 
 Modified: stable/7/tools/tools/tinybsd/tinybsd
 ==============================================================================
 --- stable/7/tools/tools/tinybsd/tinybsd	Thu Jan 27 20:12:35 2011	(r217977)
 +++ stable/7/tools/tools/tinybsd/tinybsd	Thu Jan 27 20:39:19 2011	(r217978)
 @@ -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() {
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: remko 
State-Changed-When: Fri Jan 28 06:56:03 UTC 2011 
State-Changed-Why:  
Finally merged, thanks for waiting! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135301 
>Unformatted:
