summaryrefslogtreecommitdiffstats
path: root/release/Makefile
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2014-03-05 00:45:28 +0000
committergjb <gjb@FreeBSD.org>2014-03-05 00:45:28 +0000
commit29fd702b0384f72ad342796fbdde5f96857ede18 (patch)
treed0b22534d18390c48fa42c3e71e5e1d776d31a6b /release/Makefile
parent33dce93124a0e70e57403fcbe3ee5591e17eef46 (diff)
downloadFreeBSD-src-29fd702b0384f72ad342796fbdde5f96857ede18.zip
FreeBSD-src-29fd702b0384f72ad342796fbdde5f96857ede18.tar.gz
MFC r262499, r262505, r262507, r262509:
r262499: release.sh: - Add a VCSCMD variable that defaults to 'svn checkout', and update places 'svn co' is used directly. - After sourcing a configuration file, prefix SRCBRANCH, PORTBRANCH, and DOCBRANCH with the SVNROOT. - Properly capitalize 'FreeBSD.org' in the default SVNROOT. - Update Copyright. release.conf.sample: - Add an example to use git instead of svn, by nullifying SVNROOT, and setting SRCBRANCH, DOCBRANCH, and PORTBRANCH to the URL fo a git repository. release.7: - Document VCSCMD. r262505: In release/Makefile, remove exclusion of CVS directories in the src/ and ports/ distributions. While I am thinking about it, exclude .git directories for src/ and ports/, as somewhat of a followup to r262499. r262507: Chase r262505, and remove CVS exclusion from picobsd builds. r262509: Rework how WORLD_FLAGS and KERNEL_FLAGS are set, to remove an unnecessary expr(1) call. Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile
index c2c46de..7fc52d1 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -119,13 +119,13 @@ src.txz:
mkdir -p ${DISTDIR}/usr
ln -fs ${WORLDDIR} ${DISTDIR}/usr/src
cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/src.txz --exclude .svn --exclude .zfs \
- --exclude CVS --exclude @ --exclude usr/src/release/dist usr/src
+ --exclude .git --exclude @ --exclude usr/src/release/dist usr/src
ports.txz:
mkdir -p ${DISTDIR}/usr
ln -fs ${PORTSDIR} ${DISTDIR}/usr/ports
cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/ports.txz \
- --exclude CVS --exclude .svn \
+ --exclude .git --exclude .svn \
--exclude usr/ports/distfiles --exclude usr/ports/packages \
--exclude 'usr/ports/INDEX*' --exclude work usr/ports
OpenPOWER on IntegriCloud