From owner-p4-projects@FreeBSD.ORG  Sun Jul 17 22:32:40 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 F3C7716A420; Sun, 17 Jul 2005 22:32:39 +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 C67F216A41C
	for <perforce@freebsd.org>; Sun, 17 Jul 2005 22:32:39 +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 7BA9243D45
	for <perforce@freebsd.org>; Sun, 17 Jul 2005 22:32:39 +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 j6HMWd9g057386
	for <perforce@freebsd.org>; Sun, 17 Jul 2005 22:32:39 GMT
	(envelope-from soc-saturnero@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6HMWdgb057382
	for perforce@freebsd.org; Sun, 17 Jul 2005 22:32:39 GMT
	(envelope-from soc-saturnero@freebsd.org)
Date: Sun, 17 Jul 2005 22:32:39 GMT
Message-Id: <200507172232.j6HMWdgb057382@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 80413 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: Sun, 17 Jul 2005 22:32:40 -0000

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

Change 80413 by soc-saturnero@soc-saturnero_sberta on 2005/07/17 22:32:26

	Adding buildkernel

Affected files ...

.. //depot/projects/soc2005/freesbie/Makefile#3 edit
.. //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#4 edit
.. //depot/projects/soc2005/freesbie/scripts/buildkernel.sh#1 add
.. //depot/projects/soc2005/freesbie/scripts/buildworld.sh#2 edit
.. //depot/projects/soc2005/freesbie/scripts/launch.sh#3 edit

Differences ...

==== //depot/projects/soc2005/freesbie/Makefile#3 (text+ko) ====

@@ -5,7 +5,7 @@
 #
 # $FreeBSD$
 
-all: buildworld
+all: buildworld buildkernel
 
 buildworld: .done_buildworld
 .done_buildworld:
@@ -14,5 +14,13 @@
 	@sh ./scripts/launch.sh buildworld .tmp_buildworld
 	@mv .tmp_buildworld .done_buildworld
 
+buildkernel: .done_buildworld .done_buildkernel
+.done_buildkernel:
+	@-rm -f .tmp_buildkernel
+	@touch .tmp_buildkernel
+	@sh ./scripts/launch.sh buildkernel .tmp_buildkernel
+	@mv .tmp_buildkernel .done_buildkernel
+
+
 clean:
-	@-rm -rf .tmp* .done* > /dev/null 2>&1
+	@-rm -f .tmp* .done* > /dev/null 2>&1

==== //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#4 (text+ko) ====

@@ -52,9 +52,9 @@
 #
 #NO_BUILDWORLD=YES
 
-# Define NO_BUILDKERNEL to avoid rebuilding kernel. If
-# ${MAKEOBJDIRPREFIX}/src/ssys/${KERNCONF} doesn't exist, the kernel
-# is built anyway.
+# Define NO_BUILDKERNEL to avoid rebuilding kernel. Be sure you know
+# what you're doing, you should have an already compiled kernel 
+#
 #NO_BUILDKERNEL=YES
 
 

==== //depot/projects/soc2005/freesbie/scripts/buildworld.sh#2 (text+ko) ====

@@ -29,8 +29,7 @@
 fi
 
 cd $SRCDIR
-{ 
-script -aq $LOGFILE make ${MAKEOPT:-} buildworld __MAKE_CONF=${MAKE_CONF} || print_error; 
-} | grep '^>>>'
+ 
+(script -aq $LOGFILE make ${MAKEOPT:-} buildworld __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} || print_error;) | grep '^>>>'
 
 cd $LOCALDIR

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

@@ -46,8 +46,7 @@
     echo "Something went wrong, check errors!" >&2
     [ -n "${LOGFILE:-}" ] && \
 	echo "Log saved on ${LOGFILE}" >&2
-#    kill $$ # XXX exit 1 won't work.
-    exit 1
+    kill $$ # XXX exit 1 won't work.
 }
 
 if [ -f "${LOCALDIR}/scripts/${ARCH}/${TARGET}.sh" ]; then