Tinderbox and changing X11BASE

[Tim Bishop]

On Tue, Dec 05, 2006 at 03:04:32PM -0500, Joe Marcus Clarke wrote:
> Tim Bishop wrote:
> > Is it only possible to change X11BASE for the entire Tinderbox by
> > modifying rawenv? I've tried doing it on a per-build basis by using
> > build.env, but without much success (it partially works - but
> > dependencies on commands don't work due to broken paths, I think).
> > 
> > If that is the case, it'd be a nice feature to be able to modify X11BASE
> > (and LOCALBASE) on a per-build basis :-)
> 
> The only way to use an alternate LOCALBASE or X11BASE is to modify
> rawenv.  You can do this on a per-jail version basis though by shielding
> the LOCALBASE and X11BASE variables behind "#X".  For example, to only
> change X11BASE for 6.X-based builds:
> 
> #6X11BASE=/usr/local

This would only work if I wanted all 6.X-based builds to have the same
X11BASE, which isn't what I wanted.

Anyway, I seem to have found a solution. It did turn out to just be the
PATH that was broken - X11BASE was correctly set for the builds, but
without the correct PATH binaries couldn't be found for dependencies.

I fixed^wbodged it by copying the PATH statement in portbuild to below
the section where the .env files are read - it's only a few lines down.
With this in place I can modify X11BASE on a per-build basis.

The change is below, although I'm not sure if you'd want to incorporate
it or not :-)

Tim.


--- /u1/tinderbox/scripts/portbuild.bak	Thu Nov 30 13:01:18 2006
+++ /u1/tinderbox/scripts/portbuild	Tue Dec  5 18:23:08 2006
@@ -229,6 +229,8 @@
 	. ${pb}/portstrees/${portstree}/portstree.env
 [ -f ${pb}/builds/${branch}/build.env ] && . ${pb}/builds/${branch}/build.env
 
+export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${LOCALBASE}/sbin:${LOCALBASE}/bin:${X11BASE}/bin
+
 echo "building $pkgname in $chroot"
 
 ${pb}/scripts/tc updateBuildCurrentPort -b ${branch} -n ${pkgname}


-- 
Tim Bishop
http://www.bishnet.net/tim/
PGP Key: 0x5AE7D984