[linux-dvb] [ANNOUNCE] hybrid v4l / dvb tree dependency solution

Michael Krufky mkrufky at m1k.net
Fri Jul 22 06:31:49 CEST 2005


For all of those who are used to developing and testing hybrid v4l/dvb 
code using video4linux cvs, here is the solution to our problems, at 
least for now.

I just checked two new scripts into video4linux cvs:

        * scripts/merge-trees.sh:
        - New script to symlink DVB frontend code from dvb-kernel cvs tree
          into patched video4linux cvs tree for testing and development
          across both trees.

        * scripts/unmerge-trees.sh:
        - New script to be run after development, and before generating
          patches or making cvs commits.  This removes the symlinks to the
          frontend code, and reverts the patch to the video4linux tree
          created by merge-trees.sh .

        Signed-off-by: Michael Krufky <mkrufky at m1k.net <mailto:mkrufky at m1k.net>>

The scripts assume that you are running them from withing the 
video4linux directory, and that the recent dvb-kernel tree is at the 
same level as the video4linux tree.
For example:

cd ~
cvs checkout dvb-kernel
cvs checkout video4linux
cd video4linux
scripts/merge-trees.sh

< ... insert testing / development here ... >

scripts/unmerge-trees.sh
cd ..
cvs commit video4linux/ < ... >
    - or -
generate patches against video4linux cvs

cvs commit dvb-kernel/ < ... >
    - or -
generate patches against dvb-kernel cvs


I think that everyone will agree that this solution will suffice for 
now.  Please take a look at these scripts.  I welcome any comments / 
suggestions.

-- 
Michael Krufky





More information about the linux-dvb mailing list