summaryrefslogtreecommitdiffstats
path: root/release/picobsd
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/picobsd
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/picobsd')
-rwxr-xr-xrelease/picobsd/build/picobsd4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index 1bebc87..0d3ec19 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -474,7 +474,7 @@ populate_floppy_fs() { # OK
for FLOPPY_TREE in ${PICO_TREE}/floppy.tree ${MY_TREE}/floppy.tree \
${MY_TREE}/floppy.tree.${SITE} ; do
if [ -d ${FLOPPY_TREE} ] ; then
- (cd ${FLOPPY_TREE} ; tar -cf - --exclude CVS \
+ (cd ${FLOPPY_TREE} ; tar -cf - \
--exclude .svn ${excl} . ) | \
(cd ${dst} ; tar x${o_tarv}f - )
log "Copied from ${FLOPPY_TREE}"
@@ -714,7 +714,7 @@ populate_mfs_tree() {
for MFS_TREE in ${PICO_TREE}/mfs_tree ${MY_TREE}/mfs_tree ; do
if [ -d ${MFS_TREE} ] ; then
log "Copy ${MFS_TREE} ..."
- (cd ${MFS_TREE} ; tar -cf - --exclude CVS --exclude .svn . ) | \
+ (cd ${MFS_TREE} ; tar -cf - --exclude .svn . ) | \
(cd ${dst} ; tar x${o_tarv}f - )
fi
done
OpenPOWER on IntegriCloud