Re: xenocara source
On Saturday 01 March 2008, Jason Beaudoin wrote: > > I'm not concerned about long time users like you or me, or people > > who are already familiar with UNIX and it's tools. But if this was > > your very first adventure into CVS, both the docs and ways things > > work should be clear and correct. > > As a new user of CVS and maintaining an OpenBSD install, I'm > certainly a bit confused about this. Even more so now.. what is the > suggested method.. I understand that depends on what you're trying to > accomplish: > > I'm not (yet) modifying any code under /usr/src.. so my goal is > simply pulling the -stable repositories and updating my system as > needed. Historically, OpenBSD keeps the X server code in it's own branch. You can see the cvs layout here: http://www.openbsd.org/cgi-bin/cvsweb/ There's a description of the brances here: http://www.openbsd.org/anoncvs.html On OpenBSD 4.1 and eariler the suggested layout would be: /usr/src-The system source code /usr/XF4-The X source code /usr/obj-System build object files /usr/objx -The X build object files In 4.1 and earlier, to update both system source and X source, you'd run two separate cvs commands, one for each branch. With the new 4.2 release of OpenBSD the suggested layout has changed. /usr/src-The system source code /usr/src/xenocara -The X source code /usr/obj-System build object files /usr/objx -The X build object files In 4.2 and later, to update both system source and X source, you can supposedly run just one cvs command according to the claim by Owain Ainsworth in this thread, but I personally have not tested this, and the documentation in the FAQ-5 and anoncvs.html do not mention it. I need to test this... If the claim is true, then the docs need more work. The goal of the new layout is to simplify things but since this is new, we're still ironing out the rough spots, namely making sure docs match expected behavior and are consistent (steven@ corrected anoncvs.html just a few hours ago). As for the obvious qusetion of "why keep X in it's own branch?" the answer is because it makes things simple (surprisingly enough). Keeping the build of X separated from the rest of the system allows one a lot of flexibility... If you want to add a new X server (such as the recent addition of xenocara-X.org), it's a very straight forward change. If you have esoteric/old hardware and need to run XFree86-3 (the "X11/" branch), or if you need/want XFree86-4 (the "XF4/" branch), you can easily do it. Some folks don't even bother with X, so there's not point in forcing cvs downloads/updates on them when they are just trying to maintain a simple system. Additionally, like Dongsheng Song mentioned, there are people who like keeping their X source separated from their system source tree. Of course, there are people who keep their source trees Read-Only in a central location and export them over nfs to their build machine(s). In short, there's a lot of flexibility, and how *you* want to do it is *your* own choice. The only problem here is all this flexibility tends to be a bit confusing when you're first learning it, so keeping the docs clean, correct and clear is important. Kind Regards, JCR
Re: xenocara source
> I'm not concerned about long time users like you or me, or people who > are already familiar with UNIX and it's tools. But if this was your > very first adventure into CVS, both the docs and ways things work > should be clear and correct. As a new user of CVS and maintaining an OpenBSD install, I'm certainly a bit confused about this. Even more so now.. what is the suggested method.. I understand that depends on what you're trying to accomplish: I'm not (yet) modifying any code under /usr/src.. so my goal is simply pulling the -stable repositories and updating my system as needed. thanks! ~Jason
Re: xenocara source
On Friday 29 February 2008, Marco S Hyman wrote: > > For the sake of new folks it may be wise to put a .cvsignore in > > our /usr/src tree to prevent unintended cosequences of using the > (also > suggested) prune switch on cvs (-P). > > -P will only remove EMPTY directories that cvs knows about. Putting > xenocara (or in my case zenocara and ports) in /usr/src is pretty > much a no-op when it comes to cvs. A "cd /usr/src; cvs up -Pd" > displays "? xenocara". I can live with that. > > > When following anoncvs.html, if a new person goes to update > > their /usr/src tree, they would thwack their /usr/src/xenocara > tree. > > If the directory isn't empty it isn't thwacked > If the directory isn't known by CVS it isn't thwacked. You are correct about the thwacking and I failed to actually test it. While trying to build a new -stable box from CD and looking over the site docs/faq, I noticed the discrepancy and added a .cvsignore before running any cvs update commands -But I'm odd that way, because I actually enjoy going through the docs/faq at least once per release and thinking about the suggested commands. And yes, the "? xenocara" error/message is really very trivial. But the question still stands; why does our documentation give suggested methods which result in an error/message without explaining it? I'm not concerned about long time users like you or me, or people who are already familiar with UNIX and it's tools. But if this was your very first adventure into CVS, both the docs and ways things work should be clear and correct. Yesterday I sent a diff to www@ to handle the XF4 -> xenocara changes that were missed on release in anoncvs.html. Adding a one line statement about .cvsignore and/or "? xenocara" to either anoncvs.html or faq5.html would solve this, or alternatively we could just add a .cvsignore to /usr/src It's not a big deal, and is not really a "problem" that stops stuff from working, but if we want our docs to be as clear and accuate as possible, then we need to make a change (either document the issue, or prevent it). kind regards, jcr
Re: xenocara source
On Sat, Mar 01, 2008 at 12:13:53PM +, Stuart Henderson wrote: > On 2008-03-01, hyjial <[EMAIL PROTECTED]> wrote: > > You can simply add a newline like > > /xenocara/// # I don't really remember the syntax > > in the list of directories in a file under > > /usr/src/CVS thus making all of your sources updated > > at once without any error. > > Ah, perhaps I did that at some point then... > If you checkout xenocara with cvs it will add the entry for you. But of course it won't happen if you just untar xenocara.tar.gz. -- Pierre Riteau
Re: xenocara source
On 2008-03-01, hyjial <[EMAIL PROTECTED]> wrote: > You can simply add a newline like > /xenocara/// # I don't really remember the syntax > in the list of directories in a file under > /usr/src/CVS thus making all of your sources updated > at once without any error. Ah, perhaps I did that at some point then...
Re: xenocara source
You can simply add a newline like /xenocara/// # I don't really remember the syntax in the list of directories in a file under /usr/src/CVS thus making all of your sources updated at once without any error. _ Ne gardez plus qu'une seule adresse mail ! Copiez vos mails vers Yahoo! Mail http://mail.yahoo.fr
Re: xenocara source
On 2008-03-01, Marc Espie <[EMAIL PROTECTED]> wrote: > Still, if we keep recommending /usr/src/xenocara, the ignore would get > rid of the > ? xenocara > noise. I don't see any "? xenocara" noise here, just the normal output from cvs update as it recurses into the xenocara tree.. I thought it was useful to be able to update all the source in one command, but I'm certain there will be other opinions :-)
Re: xenocara source
On Sat, 1 Mar 2008, Marc Espie wrote: Still, if we keep recommending /usr/src/xenocara, the ignore would get rid of the ? xenocara noise. Yeah, I agree. I already proposed this several times, but obviously that wasn't an interested for anyone before. -- Antoine
Re: xenocara source
On Fri, Feb 29, 2008 at 05:19:00PM -0800, Marco S Hyman wrote: > > For the sake of new folks it may be wise to put a .cvsignore in > > our /usr/src tree to prevent unintended cosequences of using the (also > > suggested) prune switch on cvs (-P). > > -P will only remove EMPTY directories that cvs knows about. Putting > xenocara (or in my case zenocara and ports) in /usr/src is pretty much > a no-op when it comes to cvs. A "cd /usr/src; cvs up -Pd" displays > "? xenocara". I can live with that. > Still, if we keep recommending /usr/src/xenocara, the ignore would get rid of the ? xenocara noise. I routinely read through the output of cvs update to figure out which files I've got which do not belong. Any extra line will make me go `huh ?' and think about it.
Re: xenocara source
On Fri, Feb 29, 2008 at 05:22:34PM -0800, J.C. Roberts wrote: > On Friday 29 February 2008, Dongsheng Song wrote: > > Yes, I'd like use /usr/xenocara, not /usr/src/xenocara. > > > > You can. The addition of a .cvsignore to /usr/src would not remove your > ability to keep your xenocara where ever you like. > > The trouble is the project documentation is misleading. If a new person > follows the documentation (faq5.html and anoncvs.html), they will > unintentionally delete their /usr/src/xenocara tree which is the > suggested location for it according to the documentation. Incorrect. I put xenocara in /usr/src/xenocara. in fact a cvs up updates both. Since i reckon i do more in the xenocara tree than most people, I think it's safe to say that it's alright. Prune only removes EMPTY directories that are in cvs. > > -jcr > -- Don't you feel more like you do now than you did when you came in?
Re: xenocara source
On Friday 29 February 2008, Dongsheng Song wrote: > Yes, I'd like use /usr/xenocara, not /usr/src/xenocara. > You can. The addition of a .cvsignore to /usr/src would not remove your ability to keep your xenocara where ever you like. The trouble is the project documentation is misleading. If a new person follows the documentation (faq5.html and anoncvs.html), they will unintentionally delete their /usr/src/xenocara tree which is the suggested location for it according to the documentation. -jcr
Re: xenocara source
> For the sake of new folks it may be wise to put a .cvsignore in > our /usr/src tree to prevent unintended cosequences of using the (also > suggested) prune switch on cvs (-P). -P will only remove EMPTY directories that cvs knows about. Putting xenocara (or in my case zenocara and ports) in /usr/src is pretty much a no-op when it comes to cvs. A "cd /usr/src; cvs up -Pd" displays "? xenocara". I can live with that. > When following anoncvs.html, if a new person goes to update > their /usr/src tree, they would thwack their /usr/src/xenocara tree. If the directory isn't empty it isn't thwacked If the directory isn't known by CVS it isn't thwacked. // marc
Re: xenocara source
Yes, I'd like use /usr/xenocara, not /usr/src/xenocara. 2008/3/1, J.C. Roberts <[EMAIL PROTECTED]>: > According to FAQ-5, the suggested place to put your xenocara source tree > is under /usr/src/xenocara > > I know it really doesn't matter where you put your xenocara tree but... > > For the sake of new folks it may be wise to put a .cvsignore in > our /usr/src tree to prevent unintended cosequences of using the (also > suggested) prune switch on cvs (-P). > > When following anoncvs.html, if a new person goes to update > their /usr/src tree, they would thwack their /usr/src/xenocara tree. > > Thoughts? > > > -JCR
