Date: Thu, 6 Oct 2005 04:35:19 GMT From: soc-andrew <soc-andrew@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 84884 for review Message-ID: <200510060435.j964ZJwk002213@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510060435.j964ZJwk002213>