From owner-p4-projects@FreeBSD.ORG  Fri Mar 10 03:46:24 2006
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 367DD16A424; Fri, 10 Mar 2006 03:46:24 +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 0932A16A420
	for <perforce@freebsd.org>; Fri, 10 Mar 2006 03:46:24 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C73CE43D48
	for <perforce@freebsd.org>; Fri, 10 Mar 2006 03:46:23 +0000 (GMT)
	(envelope-from soc-andrew@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 k2A3kNPA056136
	for <perforce@freebsd.org>; Fri, 10 Mar 2006 03:46:23 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2A3kNdK056133
	for perforce@freebsd.org; Fri, 10 Mar 2006 03:46:23 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Fri, 10 Mar 2006 03:46:23 GMT
Message-Id: <200603100346.k2A3kNdK056133@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-andrew@freebsd.org using -f
From: soc-andrew <soc-andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93091 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: Fri, 10 Mar 2006 03:46:25 -0000

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

Change 93091 by soc-andrew@soc-andrew_serv on 2006/03/10 03:46:06

	IFC

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#11 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#36 integrate

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#11 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.536 2006/02/27 09:17:39 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.537 2006/03/09 12:55:02 keramida Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -824,6 +824,10 @@
 _pwd_mkdb=	usr.sbin/pwd_mkdb
 .endif
 
+.if ${BOOTSTRAPPING} < 700014
+_gensnmptree=	usr.sbin/bsnmpd/gensnmptree
+.endif
+
 bootstrap-tools:
 .for _tool in \
     ${_strfile} \
@@ -839,6 +843,7 @@
     usr.bin/rpcgen \
     usr.bin/xinstall \
     usr.sbin/config \
+    ${_gensnmptree} \
     ${_crunchgen} \
     ${_pwd_mkdb}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#36 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.900 2006/03/08 18:02:30 sam Exp $
+# $FreeBSD: src/release/Makefile,v 1.902 2006/03/09 17:55:08 ru Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -177,10 +177,9 @@
 # Build and package both GENERIC and SMP kernels if the target
 # has both configuration files.  Otherwise only GENERIC is done.
 #
-.if !exists(${.CURDIR}/../sys/${TARGET}/conf/SMP)
-KERNELS?=	GENERIC
-.else
-KERNELS?=	GENERIC SMP
+KERNELS+=	GENERIC
+.if exists(${.CURDIR}/../sys/${TARGET}/conf/SMP)
+KERNELS+=	SMP
 .endif
 
 # mountpoint for filesystems.