[linux-dvb] Re: [ANNOUNCE] V4L CVS tree has changed

[Michael Krufky]

Mauro Carvalho Chehab wrote:

>	We've changed our tree structure to be simmilar to kernel. This
>simplifies the proccess of generating new patches to kernel, as well as
>allows better testing of includes. After downloading the newer CVS, it
>is just a matter of changing to V4l dir and do make. It will link
>everything and compile the same way as before.
>
>	This is the new tree:
>.
>|-- linux
>|   |-- Documentation
>|   |   `-- video4linux
>|   |       |-- bttv
>|   |       `-- cx88
>|   |-- drivers
>|   |   `-- media
>|   |       |-- common
>|   |       `-- video
>|   |           |-- cx88
>|   |           `-- saa7134
>|   |-- include
>|   |   |-- linux
>|   |   `-- media
>|   |-- kernel
>|   |   `-- drivers
>|   |       `-- usb
>|   |           `-- media
>|   `-- sound
>|       `-- pci
>|-- v4l
>|   |-- API
>|   `-- scripts
>`-- v4l_experimental
>  
>
It is no longer to change to v4l dir before running make.  Any make 
commands will now work in top-level v4l-kernel.

With a new cvs tree, comes a new download and dvb/v4l tree-merging 
method.  The old video4linux tree is still around, and the old 
tree-merging scripts will still work, for now.  However, on the new 
tree, there is a new dvb/v4l tree-merging method.  The new syntax is as 
follows:

cvs -d :pserver:anonymous at cvs.linuxtv.org:/cvs/video4linux login
cvs -d :pserver:anonymous at cvs.linuxtv.org:/cvs/video4linux co -P v4l-kernel

cvs -d :pserver:anonymous at cvs.linuxtv.org:/cvs/linuxtv login
cvs -z3 -d :pserver:anonymous at cvs.linuxtv.org:/cvs/linuxtv co -P dvb-kernel

cd v4l-kernel
make merge-trees
make
make install

Developers must always remember to unmerge trees before commiting changes:

make unmerge-trees

As a side note, if developers wish to work in v4l-kernel using the old 
video4linux layout, do:

make links

Please note:
All symlinks in v4l-kernel/v4l get cleared out by 'make clean' ... This 
includes dvb symlinks from the merged-tree.  If you need to make clean 
and you are using merged-tree, you must remember to unmerge-trees and 
merge them again before attempting to build:

make unmerge-trees
make clean
make merge-trees
make
make install

The following sequence will also work as well:

make clean
make unmerge-trees
make merge-trees
make
make install

Cheers,

-- 
Michael Krufky