[FIX] Re: [linux-dvb] Mixing kernel and v4l-dvb sources

[Michael Krufky]

Benjamin Gillam wrote:
> I'm not quite sure of how I should do this, so I will describe as much
> as possible. Please feel free to tell me how I should have done it so I
> know for next time!
> 
> The patch when running
> 
> make kernel-links KDIR=/path/to/kernel
> 
> fails with the following "linux/include/linux/videodev.h.rej" file:
> 
> 
> 
> ***************
> *** 1,6 ****
>  #ifndef __LINUX_VIDEODEV_H
>  #define __LINUX_VIDEODEV_H
> 
>  #include <linux/types.h>
> 
>  #define HAVE_V4L1 1
> --- 1,7 ----
>  #ifndef __LINUX_VIDEODEV_H
>  #define __LINUX_VIDEODEV_H
> 
> + #include "compat.h"
>  #include <linux/types.h>
> 
>  #define HAVE_V4L1 1
> 
> 
> 
> 
> The reason that this fails is that there is an additional line "#ifdef
> CONFIG_VIDEO_V4L1_COMPAT" before "#define HAVE_V4L1 1" which is not in
> the patch, and linux/types.h has changed to linux/videodev2.h . IE:
> 
> 
> #ifndef __LINUX_VIDEODEV_H
> #define __LINUX_VIDEODEV_H
> 
> #include <linux/videodev2.h>
> 
> #ifdef CONFIG_VIDEO_V4L1_COMPAT
> #define HAVE_V4L1 1
> 
> 
> 
> I'm not sure how to make a patch, so here is my first attempt:
> 
> 
> 
> $  diff -u -p v4l/scripts/makelinks.sh_OLD  v4l/scripts/makelinks.sh
> --- v4l/scripts/makelinks.sh_OLD        2006-08-04 10:50:42.000000000 +0100
> +++ v4l/scripts/makelinks.sh    2006-08-04 11:21:42.000000000 +0100
> @@ -57,6 +57,7 @@ diff -u -p videodev.h
>  #define __LINUX_VIDEODEV_H
> 
> +#include "compat.h"
> - #include <linux/types.h>
> + #include <linux/videodev2.h>
> 
> + #ifdef CONFIG_VIDEO_V4L1_COMPAT
>  #define HAVE_V4L1 1
> 
> 
> With this patch I now get:
> 
> 
> patching file linux/include/linux/videodev.h
> Hunk #1 succeeded at 12 (offset 11 lines).
> 
> 
> Which looks good to me?
> 
> I hope that this helps. You are all doing sterling work, thank you so
> much. I use your drivers daily, on my MythTV box, and if it wasn't for
> you guys my stress levels would probably be higher due to less time
> spent vegging out in front of it. Thanks again. :)
> 
> Regards,
> 
> Benjie Gillam.
> 
> 
> Andrew de Quincey wrote:
>> What I usually do  is:
>>
>> 1) Install the kernel sources
>> 2) hg update in v4l-dvb
>> 3) in v4l-dvb, do make kernel-links KDIR=/path/to/kernel
>>
>> I too get the patch faillure at this stage, but I've just been
>> ignoring it :)
>>
>> This'll hook the DVB drivers into the kernel, replacing the DVB stuff
>> there already.. all you need to do now is cd to the kernel directory,
>> and do a normal kernel configure/compilation. The HG drivers will have
>> been patched into the kernel so you should see 'em pop up in there.

Thanks for this... I haven't had time to update the makelinks script in
a while -- I'll try to have it updated before the weekend is over.

-Mike