From owner-p4-projects@FreeBSD.ORG  Mon Aug  8 16:38:02 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 431CE16A421; Mon,  8 Aug 2005 16:38:02 +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 17C8116A41F
	for <perforce@freebsd.org>; Mon,  8 Aug 2005 16:38:02 +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 D4CCB43D45
	for <perforce@freebsd.org>; Mon,  8 Aug 2005 16:38:01 +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 j78Gc1Fc029588
	for <perforce@freebsd.org>; Mon, 8 Aug 2005 16:38:01 GMT
	(envelope-from soc-saturnero@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78Gc1Iu029585
	for perforce@freebsd.org; Mon, 8 Aug 2005 16:38:01 GMT
	(envelope-from soc-saturnero@freebsd.org)
Date: Mon, 8 Aug 2005 16:38:01 GMT
Message-Id: <200508081638.j78Gc1Iu029585@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 81655 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: Mon, 08 Aug 2005 16:38:03 -0000

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

Change 81655 by soc-saturnero@soc-saturnero_sberta on 2005/08/08 16:37:17

	Adding pkginstall target.
	Minor fixes to the pkgselect script

Affected files ...

.. //depot/projects/soc2005/freesbie/Makefile#9 edit
.. //depot/projects/soc2005/freesbie/scripts/pkginstall.sh#1 add
.. //depot/projects/soc2005/freesbie/scripts/pkgselect.sh#2 edit

Differences ...

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

@@ -49,8 +49,15 @@
 	@sh ./scripts/launch.sh installkernel .tmp_installkernel
 	@mv .tmp_installkernel .done_installkernel
 
+pkginstall: .done_pkginstall
+.done_pkginstall: .done_installworld
+	@-rm -f .tmp_pkginstall
+	@touch .tmp_pkginstall
+	@sh ./scripts/launch.sh pkginstall .tmp_pkginstall
+	@mv .tmp_pkginstall .done_pkginstall
+
 clonefs: .done_clonefs
-.done_clonefs: .done_installkernel
+.done_clonefs: .done_installkernel .done_pkginstall
 	@-rm -f .tmp_clonefs
 	@touch .tmp_clonefs
 	@sh ./scripts/launch.sh clonefs .tmp_clonefs

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

@@ -15,8 +15,6 @@
 WORKDIR=$(mktemp -d -t freesbie)
 PKGFILE=${PKGFILE:-${LOCALDIR}/conf/packages};
 
-trap "rm -rf ${WORKDIR} && rm -rf ${LOGFILE} && exit 1" INT
-
 create_lists() {
     cd ${WORKDIR}
     echo "Creating list of available packages on the build machine..."
@@ -42,6 +40,7 @@
 	echo "Using ${PKGFILE} as source..."
 
 	while read row; do
+	    if [ -z ${row} ]; then continue; fi
 	    pkg=$(echo $row | cut -d\  -f 1)
 
 	    # pkg_info might fail if the listed package isn't present
@@ -193,9 +192,10 @@
 purge_wd() {
     cd ${LOCALDIR}
     rm -rf ${WORKDIR}
-    exit
 }
 
+trap "purge_wd && exit 1" INT
+
 create_lists
 main_dialog
 purge_wd