From owner-p4-projects@FreeBSD.ORG  Sat Oct  1 01:38:20 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6499E16A421; Sat,  1 Oct 2005 01:38:19 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0206716A41F
	for <perforce@freebsd.org>; Sat,  1 Oct 2005 01:38:19 +0000 (GMT)
	(envelope-from soc-saturnero@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BF5D343D48
	for <perforce@freebsd.org>; Sat,  1 Oct 2005 01:38:18 +0000 (GMT)
	(envelope-from soc-saturnero@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j911cIle004566
	for <perforce@freebsd.org>; Sat, 1 Oct 2005 01:38:18 GMT
	(envelope-from soc-saturnero@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j911cIpd004563
	for perforce@freebsd.org; Sat, 1 Oct 2005 01:38:18 GMT
	(envelope-from soc-saturnero@freebsd.org)
Date: Sat, 1 Oct 2005 01:38:18 GMT
Message-Id: <200510010138.j911cIpd004563@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-saturnero@freebsd.org using -f
From: soc-saturnero <soc-saturnero@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 84586 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Oct 2005 01:38:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=84586

Change 84586 by soc-saturnero@soc-saturnero_sberta on 2005/10/01 01:38:12

	- Changed DEBUG environment variable to FREESBIE_DEBUG in
	  order to avoid conflicts with buildkernel
	- Added check for existence of targets under scripts/custom
	  directory. This directory can contain customised scripts,
	  without having to patch the existent ones.

Affected files ...

.. //depot/projects/soc2005/freesbie/scripts/custom/README#1 add
.. //depot/projects/soc2005/freesbie/scripts/launch.sh#7 edit

Differences ...

==== //depot/projects/soc2005/freesbie/scripts/launch.sh#7 (text+ko) ====

@@ -17,8 +17,8 @@
     exit 1
 fi
 
-# If the DEBUG environment variable is set, be verbose.
-[ ! -z "${DEBUG:-}" ] && set -x
+# If the FREESBIE_DEBUG environment variable is set, be verbose.
+[ ! -z "${FREESBIE_DEBUG:-}" ] && set -x
 
 # Set the absolute path for the toolkit dir
 LOCALDIR=$(cd $(dirname $0)/.. && pwd)
@@ -55,7 +55,17 @@
     kill $$ # XXX exit 1 won't work.
 }
 
-if [ -f "${LOCALDIR}/scripts/${ARCH}/${TARGET}.sh" ]; then
+# Check order:
+#  - scripts/custom/${ARCH}/${TARGET}.sh
+#  - scripts/custom/${TARGET}.sh
+#  - scripts/${ARCH}/${TARGET}.sh
+#  - scripts/custom/${ARCH}/${TARGET}.sh
+
+if [ -f "${LOCALDIR}/scripts/custom/${ARCH}/${TARGET}.sh" ]; then
+    . ${LOCALDIR}/scripts/custom/${ARCH}/${TARGET}.sh
+elif [ -f "${LOCALDIR}/scripts/custom/${TARGET}.sh" ]; then
+    . ${LOCALDIR}/scripts/custom/${TARGET}.sh
+elif [ -f "${LOCALDIR}/scripts/${ARCH}/${TARGET}.sh" ]; then
     . ${LOCALDIR}/scripts/${ARCH}/${TARGET}.sh
 elif [ -f "${LOCALDIR}/scripts/${TARGET}.sh" ]; then
     . ${LOCALDIR}/scripts/${TARGET}.sh
@@ -63,4 +73,4 @@
 
 if [ ${REMOVELOG} -eq 1 ]; then
     rm -f ${LOGFILE}
-fi+fi