summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authormatusita <matusita@FreeBSD.org>2002-01-31 00:38:09 +0000
committermatusita <matusita@FreeBSD.org>2002-01-31 00:38:09 +0000
commitfdc99f4021e5f4688253ad52ed691a1c58c0f8b5 (patch)
tree50cd4d34faa0c55782ac3a2f5e88b42237548a05 /release
parent6019ad8c572ecbd8e913454af76501f32b6552aa (diff)
downloadFreeBSD-src-fdc99f4021e5f4688253ad52ed691a1c58c0f8b5.zip
FreeBSD-src-fdc99f4021e5f4688253ad52ed691a1c58c0f8b5.tar.gz
In revision 1.351, All files/directories in ${CHROOTDIR}/usr/ports/distfiles
are removed, because ports.tgz includes distfiles by accident. However, removing files/directories is *not* mandatory. The only requirement is "ports.tgz doesn't include distfiles/* but distfiles directory itself". If this is correct, the right way is to set an option to tar(1), not to include these files. This commit is based on PR: 34194, but a little bit of modification is made by me (original patch doesn't include 'distfiles' directory). PR: 34194 Reviewed by: Adrian Steinmann <ast@marabu.ch> (PR submitter) MFC after: 9 days
Diffstat (limited to 'release')
-rw-r--r--release/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile
index 95e3c70..0bea19d 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -778,9 +778,9 @@ cdrom.1:
@cp ${CD_DISC1}/floppies/boot.flp ${CD_DISC2}/floppies
.endif
.if !defined(NOPORTS)
- @-rm -rf /usr/ports/distfiles/*
@mkdir -p ${CD_DISC1}/ports && \
- tar --exclude CVS -czf ${CD_DISC1}/ports/ports.tgz -C /usr ports && \
+ tar --exclude CVS --exclude 'ports/distfiles/*' -czf \
+ ${CD_DISC1}/ports/ports.tgz -C /usr ports && \
cp ${.CURDIR}/scripts/ports-install.sh ${CD_DISC1}/ports/install.sh \
&& (cd ${CD_DISC1}/ports; md5 * > CHECKSUM.MD5)
.endif
OpenPOWER on IntegriCloud