aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Linimon <linimon@FreeBSD.org>2010-12-01 02:38:04 +0000
committerMark Linimon <linimon@FreeBSD.org>2010-12-01 02:38:04 +0000
commit28905d90358f7eea073658567aa630701041eb83 (patch)
tree0fd5cebfe5367699d6d3016be60cf5648b5872ab
parent5cfbfdffd1b38fa701d103d717ba09623e093ef6 (diff)
downloadports-28905d90358f7eea073658567aa630701041eb83.tar.gz
ports-28905d90358f7eea073658567aa630701041eb83.zip
Refactor some variables that need to be in sync between the server-side
and client-side definitions into common.conf. While here, slide the 7-stable release to 7.3. This was driving me crazy while trying to debug the INDEX and duds problems.
Notes
Notes: svn path=/head/; revision=265490
-rw-r--r--Tools/portbuild/conf/client.conf5
-rw-r--r--Tools/portbuild/conf/server.conf4
2 files changed, 3 insertions, 6 deletions
diff --git a/Tools/portbuild/conf/client.conf b/Tools/portbuild/conf/client.conf
index 76839be5ae89..ddd6e7e6433a 100644
--- a/Tools/portbuild/conf/client.conf
+++ b/Tools/portbuild/conf/client.conf
@@ -19,14 +19,9 @@ CLIENT_UPLOAD_HOST=pointyhat.FreeBSD.org
# items that will most likely be common to all package build masters
#
-ARCHS_REQUIRING_AOUT_COMPAT="i386"
-ARCHS_REQUIRING_LINPROCFS="amd64 i386"
-
CLIENT_DISTDIR=/tmp/distfiles
-CLIENT_LOCALBASE=/usr/local
# XXX renaming this from PACKAGES
CLIENT_PACKAGES_LOCATION=/tmp/packages
-CLIENT_PKGSUFFIX=.tbz
CLIENT_SRCBASE=/usr/src
CLIENT_WRKDIRPREFIX=/work
diff --git a/Tools/portbuild/conf/server.conf b/Tools/portbuild/conf/server.conf
index b82222c9782f..0fe9f966a590 100644
--- a/Tools/portbuild/conf/server.conf
+++ b/Tools/portbuild/conf/server.conf
@@ -20,10 +20,12 @@ SUPPORTED_ARCHS="amd64 i386 ia64 powerpc sparc64"
SRC_BRANCHES="6 7 8 9"
SRC_BRANCHES_PATTERN="^[0-9]*"
SRC_BRANCH_6_TAG=RELENG_6_4
-SRC_BRANCH_7_TAG=RELENG_7_1
+SRC_BRANCH_7_TAG=RELENG_7_3
SRC_BRANCH_8_TAG=RELENG_8_0
SRC_BRANCH_9_TAG=.
+DEFAULT_LINUX_OSRELEASE="2.6.16"
+
#
# directory management definitions
#