diff options
| author | kris <kris@FreeBSD.org> | 2007-02-18 17:03:21 +0800 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2007-02-18 17:03:21 +0800 |
| commit | 4ba8d27f466bbada861c1ddab2e832a15cd13dd0 (patch) | |
| tree | ad3903c7010d3a8947c3cdf7f692b80451ed9b05 /Tools | |
| parent | 1dd549515566e8429dd6927b91fa7d9d3fe48676 (diff) | |
| download | freebsd-ports-graphics-4ba8d27f466bbada861c1ddab2e832a15cd13dd0.tar.gz freebsd-ports-graphics-4ba8d27f466bbada861c1ddab2e832a15cd13dd0.tar.zst freebsd-ports-graphics-4ba8d27f466bbada861c1ddab2e832a15cd13dd0.zip | |
Also filter out gconf leftover files from /usr/local as well as /usr/X11R6.
Set DISPLAY to the IP address instead of using the :<...> implied form.
This is required for jails.
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/portbuild/scripts/buildscript | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Tools/portbuild/scripts/buildscript b/Tools/portbuild/scripts/buildscript index bd7ea6682e3..52aa7a47b9a 100755 --- a/Tools/portbuild/scripts/buildscript +++ b/Tools/portbuild/scripts/buildscript @@ -170,6 +170,7 @@ if [ $phase = 1 ]; then ./usr/local/news ./usr/local/share/xml ./usr/X11R6/etc/gconf +./usr/local/etc/gconf EOF # Record a "pristine" mtree. mtree -X /tmp/mtree.preexclude -xcn -k uid,gid,mode -p / > /tmp/mtree.pristine @@ -235,6 +236,7 @@ else ./usr/local/news ./usr/local/share/xml ./usr/X11R6/etc/gconf +./usr/local/etc/gconf EOF # Record a "pristine" mtree. mtree -X /tmp/mtree.buildexclude -xcn -k uid,gid,mode -p / > /tmp/mtree.prebuild @@ -245,7 +247,7 @@ EOF pid=$(echo $$ % 32768 | bc) X11BASE=$(which Xvfb | sed -e 's./bin/Xvfb..') Xvfb :${pid} -fp ${X11BASE}/lib/X11/fonts/misc & - DISPLAY=:${pid} + DISPLAY=${JAIL_ADDR}:${pid} export DISPLAY fi @@ -258,8 +260,7 @@ EOF cd $dir /pnohang $TIMEOUT /tmp/make.log5 ${pkgname} make -k regression-test cat /tmp/make.log5 - - mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml )" > /tmp/list.preinstall + mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml )" > /tmp/list.preinstall if [ -s /tmp/list.preinstall ]; then echo "================================================================" @@ -305,7 +306,7 @@ EOF cleanup 7 fi - mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml )" > /tmp/list3 + mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml )" > /tmp/list3 # Compare the state of the filesystem now to before the 'make install' phase dirty=0 |