summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorhubertf <hubertf>2002-08-20 02:17:56 +0000
committerhubertf <hubertf>2002-08-20 02:17:56 +0000
commit2adcc7179d1e1a154355f1085e413401854f3b8a (patch)
tree2a411b93690921a1ee9a54e54004a25b815877e7 /mk
parent0fe2834f60030abd9233e28d830f92de10714292 (diff)
downloadpkgsrc-2adcc7179d1e1a154355f1085e413401854f3b8a.tar.gz
Add CVS_FLAGS that will be passed to 'cvs update' before builds.
Allows specifying a branch ("-rnetbsd-1-6") or the trunk ("-A") easily from the build.conf file.
Diffstat (limited to 'mk')
-rw-r--r--mk/bulk/build.conf-example6
-rw-r--r--mk/bulk/pre-build4
2 files changed, 7 insertions, 3 deletions
diff --git a/mk/bulk/build.conf-example b/mk/bulk/build.conf-example
index c6119359139..08e86c0210a 100644
--- a/mk/bulk/build.conf-example
+++ b/mk/bulk/build.conf-example
@@ -1,5 +1,5 @@
# build.conf
-# $NetBSD: build.conf-example,v 1.11 2002/08/07 10:56:12 agc Exp $
+# $NetBSD: build.conf-example,v 1.12 2002/08/20 02:17:56 hubertf Exp $
#
# config file in /bin/sh syntax for {,pre,post}-build
#
@@ -29,6 +29,10 @@ USR_PKGSRC="/usr/pkgsrc"
# As which user to run "cvs updates". Leave empty for no update.
CVS_USER="yourlogin"
+# Flags to pass to 'cvs update', e.g. to get a certain branch
+#CVS_FLAGS="-rnetbsd-1-6"
+#CVS_FLAGS="-A"
+
# prune distfiles to remove those which are out of date
# can be set to 'yes' or 'no'.
PRUNEDISTFILES=no
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index d2960a223a6..5398fc74e90 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: pre-build,v 1.22 2002/08/07 10:56:12 agc Exp $
+# $NetBSD: pre-build,v 1.23 2002/08/20 02:17:57 hubertf Exp $
#
# Clean up system to be ready for bulk pkg build
#
@@ -114,7 +114,7 @@ if [ "$CVS_USER" != "" ]; then
( cd ${USR_PKGSRC}/security/ssh ; ${BMAKE} bulk-install )
fi
echo Performing CVS update - this will take some time
- su - ${CVS_USER} -c 'stty sane ; setenv CVS_RSH ssh ; cd '${USR_PKGSRC}' ; cvs -q update -Pd'
+ su - ${CVS_USER} -c 'stty sane ; setenv CVS_RSH ssh ; cd '${USR_PKGSRC}' ; cvs -q update -Pd ${CVS_FLAGS}'
echo CVS update done.
fi