From owner-p4-projects@FreeBSD.ORG  Thu Oct  6 04:35: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 E436716A421; Thu,  6 Oct 2005 04:35: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 A5F6416A41F
	for <perforce@freebsd.org>; Thu,  6 Oct 2005 04:35:19 +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 7097D43D46
	for <perforce@freebsd.org>; Thu,  6 Oct 2005 04:35:19 +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 j964ZJct002216
	for <perforce@freebsd.org>; Thu, 6 Oct 2005 04:35:19 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j964ZJwk002213
	for perforce@freebsd.org; Thu, 6 Oct 2005 04:35:19 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Thu, 6 Oct 2005 04:35:19 GMT
Message-Id: <200510060435.j964ZJwk002213@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 84884 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: Thu, 06 Oct 2005 04:35:20 -0000

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

Change 84884 by soc-andrew@soc-andrew_serv on 2005/10/06 04:34:59

	Don't split the distfiles when BSDINSTALLER is defined to simplify the extraction process with libarchive

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#16 edit

Differences ...

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

@@ -1137,6 +1137,7 @@
 .endif
 	@rm -rf ${RD}/dists/${TD}/${TN}*
 	@mkdir -p ${RD}/dists/${TD}
+.if !defined(BSDINSTALLER)
 	@( cd ${SD} && \
 		tn=`echo ${TN} | tr 'A-Z' 'a-z' | cut -c1-8` && \
 		echo rolling ${TD}/$$tn tarball &&\
@@ -1154,12 +1155,28 @@
 			  > ${RD}/dists/${TD}/$$tn.mtree ; \
 		else \
 			true; \
+		fi; \ 
+	)
+.else
+	@( cd ${SD} && \
+		tn=`echo ${TN} | tr 'A-Z' 'a-z' | cut -c1-8` && \
+		echo rolling ${TD}/$$tn tarball &&\
+		tar --exclude CVS --exclude obj --exclude BOOTMFS -cf - ${ARG} | \
+		gzip --no-name -9 -c > ${RD}/dists/${TD}/$$tn.gz && \
+		if [ "${SD}" != "/usr/src" ]; then \
+			mtree -c -i -p ${SD}/${ARG} \
+			-k gname,md5digest,mode,nlink,uname,size,link,type \
+			> ${RD}/dists/${TD}/$$tn.mtree ; \
+		else \
+			true; \
 		fi; \
-		( cd ${RD}/dists/${TD}; \
+	)
+.endif
+	@( cd ${RD}/dists/${TD}; \
 		rm -f .CHECKSUM.MD5 CHECKSUM.SHA256; \
 		md5 * > .CHECKSUM.MD5; \
 		sha256 * > CHECKSUM.SHA256; \
-		mv .CHECKSUM.MD5 CHECKSUM.MD5) \
+		mv .CHECKSUM.MD5 CHECKSUM.MD5 \
 	)
 
 doRELEASE: release.1 release.2 ${DOCREL} release.3 release.4 \