diff options
| author | linimon <linimon@FreeBSD.org> | 2010-06-26 07:23:17 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2010-06-26 07:23:17 +0800 |
| commit | 37a3584994861d0c17835607af8f694effa58b5d (patch) | |
| tree | 919e06744dfa73205293525482651edcf4dc7635 /Tools | |
| parent | 14cff5745a6f8cfb46911a1e4ff13eee2c16e186 (diff) | |
| download | freebsd-ports-gnome-37a3584994861d0c17835607af8f694effa58b5d.tar.gz freebsd-ports-gnome-37a3584994861d0c17835607af8f694effa58b5d.tar.zst freebsd-ports-gnome-37a3584994861d0c17835607af8f694effa58b5d.zip | |
Generalize the packge building scripts to be able to be run on more than
one 'head' node, rather than just pointyhat itself.
Constants are factored out into installation-specific files known as
portbuild/conf/server.conf and portbuild/conf/client.conf. There is
only one server.conf file. Individual <arch> directories may have
their own client.conf files, or may symlink to ../conf/client.conf.
Fix the sed script to correctly handle '.' in branch directory names.
Feature safe: yes
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/portbuild/scripts/makerestr | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Tools/portbuild/scripts/makerestr b/Tools/portbuild/scripts/makerestr index 8346b863a6f7..81e43c85c77b 100755 --- a/Tools/portbuild/scripts/makerestr +++ b/Tools/portbuild/scripts/makerestr @@ -15,6 +15,7 @@ branch=$2 buildid=$3 shift +. ${pb}/conf/server.conf . ${pb}/${arch}/portbuild.conf . ${pb}/scripts/buildenv @@ -33,6 +34,6 @@ export PORT_DBDIR=/nonexistentport cd ${PORTSDIR} make -j4 ECHO_MSG=true clean-restricted-list \ - | sed -e "s./usr/ports/packages/.${builddir}/packages/.g" \ - -e "s./usr/ports/.${builddir}/ports/.g" \ + | sed -e "s!/usr/ports/packages/!${builddir}/packages/!g" \ + -e "s!/usr/ports/!${builddir}/ports/!g" \ > ${builddir}/restricted.sh |