Hi Jonathan et al, - usr/src/Makefile.master * line 1057ff, I notice that you still append the DEVELOPERUID to the IPSPKG_BRANCH string. Strictly speaking, if we go by the model that each developer has its own dedicated repository, we don't need to append the DEVELOPERUID anymore. So you might be able to eliminate line 1058 and remove its usage everywhere else.
* since the port number will get automagically calculated, I would vote for also including the script to start the developer repo within the gate along your putback, which hopefully will then use the same algorithm to start the repo on that port number. Otherwise it might not be obvious to developers which port they are expected to run the repo under. - usr/src/ipsdefs/Makefile.targ * line 55ff, I see that error handling is removed since now IPSREPO_URL is always set. But if the developer did not setup the repo, then all individual pkgsend will fail. It might be useful to check with something like mconnect(1) or telnet(1) to verify that indeed something is listening on the IPSREPO_URL, if not give a meaningful error message. Otherwise we rely on the error that pkgsend gives to be meaningful :) - usr/src/tools/scripts/nbuild.ksh * line 395ff, might still be usefull to list IPSREPO_URL with a small description what the default repo looks like and that it is possible to overwrite it. * line 1576, could be that my understanding of Clear_env() was wrong at the time I made the change, but if we want to allow developers to overwrite IPSREPO_URL, don't we want to list IPSREPO_URL here, since otherwise it will get unset, and thus the default will get used? Greets Thorsten Jonathan Mellors wrote: > Hi Folks, > > I've modified the Colorado code Thorsten originally introduced to > support sending IPS packages to an IPS repository. The purpose of the > change is to set a sensible default for the IPSREPO_URL in > Makefile.master. This default setting can then be used by both nbuild > and nbmake, or overridden if required. > > To allow multiple developers to have their own individual IPS > repositories on the same build server, we came up with the idea of using > the user's uid for the port number of the IPS depot server > "pkg.depotd(1M)". To allow developers to assign their own ports we have > to avoid the privileged ports (1 - 1023), which leaves us with the range > 1024 - 65535. Any uids below 1024 will have an assigned port number of > uid+1024. Any uids above 65535 will have an assigned port number of uid > modulo 65536, with 1024 being added if the modulo result is below 1024. > Obviously there's a small chance that more than one user could be > assigned the same port number, but if that happens they can override > IPSREPO_URL on the nbuild/nbmake command line. You would also have to > override IPSREPO_URL, if the IPS packages are to be sent to any other > server than the one you're building on. > > Webrev is at: > http://cr.opensolaris.org/~jmellors/ipsrepo/ > > Thanks > Jonathan -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Sitz der Gesellschaft: Sun Microsystems GmbH, Sonnenallee 1, D-85551 Kirchheim-Heimstetten Amtsgericht Muenchen: HRB 161028 Geschaeftsfuehrer: Thomas Schroeder, Wolfgang Engels, Dr. Roland Boemer Vorsitzender des Aufsichtsrates: Martin Haering ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~