From owner-p4-projects@FreeBSD.ORG Tue Mar 28 21:31:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E08316A440; Tue, 28 Mar 2006 21:31:18 +0000 (UTC) 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 4372916A431 for ; Tue, 28 Mar 2006 21:31:18 +0000 (UTC) (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 232C543D76 for ; Tue, 28 Mar 2006 21:31:14 +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 k2SLVEcf068220 for ; Tue, 28 Mar 2006 21:31:14 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2SLVD50068217 for perforce@freebsd.org; Tue, 28 Mar 2006 21:31:13 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 28 Mar 2006 21:31:13 GMT Message-Id: <200603282131.k2SLVD50068217@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 94209 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 21:31:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=94209 Change 94209 by soc-andrew@soc-andrew_serv on 2006/03/28 21:31:12 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#39 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/scripts/kernels-install.sh#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#8 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#39 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.906 2006/03/18 21:37:05 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.908 2006/03/23 07:48:58 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -512,6 +512,10 @@ # NB: these may fail if the host is running w/o devfs echo "umount /dev >/dev/null 2>&1 || true" >> ${_MK} echo "mount -t devfs devfs /dev >/dev/null 2>&1 || true" >> ${_MK} + echo "if [ ! -c /dev/null ]; then" >> ${_MK} + echo " echo /dev/null is not a device!" >> ${_MK} + echo " exit 1" >> ${_MK} + echo "fi" >> ${_MK} echo "if [ -x /etc/rc.d/ldconfig ]; then" >> ${_MK} echo " /etc/rc.d/ldconfig start" >> ${_MK} echo "else" >> ${_MK} @@ -1211,7 +1215,8 @@ > ${RD}/dists/${TD}/$$tn.inf && \ if [ -f ${.CURDIR}/scripts/$${TD}-install.sh ]; then \ cp -p ${.CURDIR}/scripts/$${TD}-install.sh \ - ${RD}/dists/${TD}/install.sh; \ + ${RD}/dists/${TD}/install.sh && \ + chmod +x ${RD}/dists/${TD}/install.sh; \ fi && \ if [ "${SD}" != "/usr/src" ]; then \ mtree -c -i -p ${SD}/${ARG} \ ==== //depot/projects/soc2005/bsdinstaller/src/release/scripts/kernels-install.sh#2 (text) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/kernels-install.sh,v 1.1 2006/03/08 18:03:09 sam Exp $ +# $FreeBSD: src/release/scripts/kernels-install.sh,v 1.2 2006/03/21 15:49:03 sam Exp $ # if [ "`id -u`" != "0" ]; then @@ -37,7 +37,7 @@ fi # translate per Makefile:doTARBALL XXX are we sure to have tr+cut? tn=`echo ${CONFIG} | tr 'A-Z' 'a-z' | cut -c1-8` - cat $tn.?? | tar --unlink -xpzf - -C ${DESTDIR:-/} + cat $tn.?? | tar --unlink -xpzf - -C $BOOT else echo "Installation of $CONFIG kernel distribution not done." fi ==== //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.291 2006/03/20 14:24:58 ru Exp $ +# $FreeBSD: src/usr.bin/Makefile,v 1.292 2006/03/21 11:00:54 ru Exp $ .include @@ -262,8 +262,14 @@ .if ${MK_OPENSSL} != "no" _chkey= chkey _newkey= newkey +.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" +.if ${MK_LIBC_R} != "no" _csup= csup .endif +.elif ${MK_LIBPTHREAD} != "no" +_csup= csup +.endif +.endif .if ${MK_HESIOD} != "no" _hesinfo= hesinfo