csup: How do I know I have correct version?
After I run csup /usr/share/examples/releng9-supfile how do I know I have the correct version, like 9.0-BETA3 or 9.0-RC1? I can't find any such information explicitly anywhere under /usr/src . This releng9-supfile was made from stable-supfile by changing RELENG_8 to RELENG_9 in the line *default release=cvs tag=RELENG_8 I've been following the emailing lists current, questions and ports, noticed the heads-up that HEAD was going to 10-current. Maybe also I should put this releng9-supfile in a safer place where it won't be deleted by the next installation/upgrade? Tom ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "freebsd-questions-unsubscr...@freebsd.org"
Re: csup: How do I know I have correct version?
On 10/21/11 11:27 AM, Thomas Mueller wrote: > After I run > > csup /usr/share/examples/releng9-supfile > > how do I know I have the correct version, like 9.0-BETA3 or 9.0-RC1? > > I can't find any such information explicitly anywhere under /usr/src . > > This releng9-supfile was made from stable-supfile by changing RELENG_8 to > RELENG_9 in the line > > *default release=cvs tag=RELENG_8 > > I've been following the emailing lists current, questions and ports, > noticed the heads-up that HEAD was going to 10-current. > > Maybe also I should put this releng9-supfile in a safer place where > it won't be deleted by the next installation/upgrade? > Indeed you should. >From my /etc/make.conf: SUP_UPDATE= yes SUP=/usr/bin/csup SUPFLAGS= -zgL 2 SUPHOST=cvsup1.fr.freebsd.org SUPFILE=/etc/cvsup/stable-supfile PORTSSUPFILE= /etc/cvsup/ports-supfile DOCSUPFILE= /etc/cvsup/doc-supfile Then, you just have to copy the sample supfiles to /etc/cvsup/ ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "freebsd-questions-unsubscr...@freebsd.org"
Re: csup: How do I know I have correct version?
On 21/10/2011 10:27, Thomas Mueller wrote:
> After I run
>
> csup /usr/share/examples/releng9-supfile
>
> how do I know I have the correct version, like 9.0-BETA3 or 9.0-RC1?
So long as you're confident that you have actually downloaded the
sources from the RELENG_9 branch, then you can be confident that the
system version will be one of those -- at the moment, you'll get 9.0-RC1
but over time this will eventually change to 9.0-STABLE.
> I can't find any such information explicitly anywhere under /usr/src .
The file you want is /usr/src/sys/conf/newvers.sh This is a script that
edits version information into various source code files. The bit you
need is near the top of the file -- just following line 33:
33 TYPE="FreeBSD"
34 REVISION="9.0"
35 BRANCH="RC1"
36 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
37 BRANCH=${BRANCH_OVERRIDE}
38 fi
39 RELEASE="${REVISION}-${BRANCH}"
40 VERSION="${TYPE} ${RELEASE}"
41 SYSDIR=$(dirname $0)/..
Unfortunately the value want is RELEASE, which is assembled from parts,
so not trivially grep'able. But you can easily see the REVISION is set
to 9.0 and BRANCH is RC1 so the whole things comes to 9.0-RC1. Simple.
> This releng9-supfile was made from stable-supfile by changing RELENG_8 to
> RELENG_9 in the line
>
> *default release=cvs tag=RELENG_8
>
> I've been following the emailing lists current, questions and ports,
> noticed the heads-up that HEAD was going to 10-current.
>
> Maybe also I should put this releng9-supfile in a safer place where
> it won't be deleted by the next installation/upgrade?
No -- you shouldn't need to worry about that. The name
'releng9-supfile' you chose doesn't match anything produced by the
system, so it won't be overwritten. (Not that you shouldn't keep a
backup somewhere -- that's only sensible.)
Hmmm actually you have highlighted a small omission in the
procedures for branching RELENG_9 and RELENG_9_0 -- the cvsup example
supfiles /usr/src/share/examples/{stable,standard}-supfile should be
updated to match the branch they are installed from. In your case both
of those files should use the RELENG_9 tag, but that hasn't been
commmitted yet.
Cheers
Matthew
--
Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard
Flat 3
PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate
JID: matt...@infracaninophile.co.uk Kent, CT11 9PW
signature.asc
Description: OpenPGP digital signature
Re: csup: How do I know I have correct version?
From: Damien Fleuriot :
> > Maybe also I should put this releng9-supfile in a safer place where
> > it won't be deleted by the next installation/upgrade?
> Indeed you should.
> >>From my /etc/make.conf:
> SUP_UPDATE= yes
> SUP=/usr/bin/csup
> SUPFLAGS= -zgL 2
> SUPHOST=cvsup1.fr.freebsd.org
> SUPFILE=/etc/cvsup/stable-supfile
> PORTSSUPFILE= /etc/cvsup/ports-supfile
> DOCSUPFILE= /etc/cvsup/doc-supfile
> Then, you just have to copy the sample supfiles to /etc/cvsup/
Then how do you update the system source, ports tree or doc?
Something with 'make'? 'make update' ?
For ports, I run
portsnap fetch update
For system source, I run
csup /usr/share/examples/releng9-supfile
though I subsequently moved the releng9-supfile to /myconfig .
from Matthew Seaman :
> The file you want is /usr/src/sys/conf/newvers.sh This is a script that
> edits version information into various source code files. The bit you
> need is near the top of the file -- just following line 33:
> 33 TYPE="FreeBSD"
> 34 REVISION="9.0"
> 35 BRANCH="RC1"
> 36 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
> 37 BRANCH=${BRANCH_OVERRIDE}
> 38 fi
> 39 RELEASE="${REVISION}-${BRANCH}"
> 40 VERSION="${TYPE} ${RELEASE}"
> 41 SYSDIR=$(dirname $0)/..
> Unfortunately the value want is RELEASE, which is assembled from parts,
> so not trivially grep'able. But you can easily see the REVISION is set
> to 9.0 and BRANCH is RC1 so the whole things comes to 9.0-RC1. Simple.
That's the file I was looking for, I was not familiar with that particular file
name.
It's easy to find a needle in the haystack when somebody points it out to me!
My thanks!
> > Maybe also I should put this releng9-supfile in a safer place where
> > it won't be deleted by the next installation/upgrade?
> No -- you shouldn't need to worry about that. The name
> 'releng9-supfile' you chose doesn't match anything produced by the
> system, so it won't be overwritten. (Not that you shouldn't keep a
> backup somewhere -- that's only sensible.)
> Hmmm actually you have highlighted a small omission in the
> procedures for branching RELENG_9 and RELENG_9_0 -- the cvsup example
> supfiles /usr/src/share/examples/{stable,standard}-supfile should be
> updated to match the branch they are installed from. In your case both
> of those files should use the RELENG_9 tag, but that hasn't been
> commmitted yet.
> Cheers
> Matthew
Good point. I had to make the little modification in the stable-supfile to
accommodate RELENG_9 .
Since my current efforts are directed toward a working FreeBSD 9.0 system, I am
not currently doing anything with 10-current.
Tom
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "freebsd-questions-unsubscr...@freebsd.org"
Re: csup: How do I know I have correct version?
On 22/10/2011 10:22, Thomas Mueller wrote: > From: Damien Fleuriot : >>> > >>From my /etc/make.conf: >> > SUP_UPDATE= yes >> > SUP=/usr/bin/csup >> > SUPFLAGS= -zgL 2 >> > SUPHOST=cvsup1.fr.freebsd.org >> > SUPFILE=/etc/cvsup/stable-supfile >> > PORTSSUPFILE= /etc/cvsup/ports-supfile >> > DOCSUPFILE= /etc/cvsup/doc-supfile > > >> > Then, you just have to copy the sample supfiles to /etc/cvsup/ > Then how do you update the system source, ports tree or doc? > Something with 'make'? 'make update' ? make update is the correct command. > For ports, I run > portsnap fetch update > > For system source, I run > csup /usr/share/examples/releng9-supfile > > though I subsequently moved the releng9-supfile to /myconfig . Don't define PORTSSUPFILE in /etc/make.conf if you're using portsnap(1). Apart from anything else, typing 'make update' in /usr/src will attempt to cvsup not just the system sources but as well any of PORTS, DOC where you've defined a ...SUPFILE. In fact, without PORTSUPFILE defined in /etc/make.conf typing 'make update' in /usr/ports will invoke portsnap for you, so long as you obtained the ports tree by 'portsnap fetch extract' originally. Cheers, Matthew -- Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard Flat 3 PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate JID: matt...@infracaninophile.co.uk Kent, CT11 9PW signature.asc Description: OpenPGP digital signature
Re: csup: How do I know I have correct version?
from Matthew Seaman : > Don't define PORTSSUPFILE in /etc/make.conf if you're using portsnap(1). > Apart from anything else, typing 'make update' in /usr/src will attempt > to cvsup not just the system sources but as well any of PORTS, DOC where > you've defined a ...SUPFILE. > In fact, without PORTSUPFILE defined in /etc/make.conf typing 'make > update' in /usr/ports will invoke portsnap for you, so long as you > obtained the ports tree by 'portsnap fetch extract' originally. > Cheers, > Matthew Now I know better how 'make update' works, though I looked at that target in /usr/src/Makefile. I find from experience that updating ports by two different means makes a mess or at least doesn't work. In 9.0-BETA1, I tried 'portsnap fetch update' some time after having installed the ports tree from the bsdinstall. That didn't work, and I had to 'portsnap fetch' and 'portsnap extract' as if I had never installed the ports tree from the bsdinstall. I guess then I can install the docs by 'csup /usr/share/examples/doc-supfile' ? That would be simpler and easier than installing misc/freebsd-doc-en from the ports. Tom ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "freebsd-questions-unsubscr...@freebsd.org"
