diff options
| author | Michael Krufky <devnull@localhost> | 2005-11-27 17:36:36 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-11-27 17:36:36 +0000 |
| commit | d982d0785dbabdb747d4804e3fda64edc274bfc1 (patch) | |
| tree | c5c50a476a7a0c42d1dc911bf239cf5ac6d1477a /v4l | |
| parent | 5f4304de0f58e54b69bf13b73ffc169e8e402517 (diff) | |
| download | mediapointer-dvb-s2-d982d0785dbabdb747d4804e3fda64edc274bfc1.tar.gz mediapointer-dvb-s2-d982d0785dbabdb747d4804e3fda64edc274bfc1.tar.bz2 | |
updated "make kernel-links" for merged tree
"make kernel-links" (dvb-kernel "makelinks" build method)
updated for merged tree.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 9 | ||||
| -rw-r--r-- | v4l/Makefile | 4 | ||||
| -rw-r--r-- | v4l/scripts/makelinks.sh | 32 |
3 files changed, 22 insertions, 23 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 6ea31ddd8..f6568060d 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-11-27 17:34 mkrufky + + * ../v4l/Makefile: + * ../v4l/scripts/makelinks.sh: + - "make kernel-links" (dvb-kernel "makelinks" build method) + Updated for merged tree. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-11-27 15:02 mkrufky * ../v4l/Makefile: diff --git a/v4l/Makefile b/v4l/Makefile index 622e76dff..291511440 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -274,7 +274,7 @@ links:: # @find ../linux/include -name '*.[h]' -type f -exec ln -sf '{}' . \; -kernel-links:: +kernel-links makelinks:: cd ..; v4l/scripts/makelinks.sh $(KDIR) install:: v4l-install dvb-install @@ -344,7 +344,7 @@ dvb-install:: dvb-rminstall /sbin/depmod -a -old_install:: rminstall +old-install:: rminstall @echo -e "\nInstalling new V4L modules at $(DEST)..." @strip --strip-debug $(inst-m) diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh index 557924c8b..56bc40588 100644 --- a/v4l/scripts/makelinks.sh +++ b/v4l/scripts/makelinks.sh @@ -37,43 +37,33 @@ for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do ln -v -f -s $PWD/$x $1/$x done -for x in `find Documentation -type l | grep -v CVS | grep -v .cvsignore` ; do - ln -v -f -s $PWD/$x $1/$x -done - -for x in `find drivers -type l | grep -v CVS | grep -v .cvsignore` ; do - ln -v -f -s $PWD/$x $1/$x -done - -for x in `find include -type l | grep -v CVS | grep -v .cvsignore` ; do - ln -v -f -s $PWD/$x $1/$x -done - cd .. ln -v -f -s $PWD/v4l/compat.h $1/include/media/compat.h ln -v -f -s $PWD/v4l/compat.h $1/include/linux/compat.h ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/common/compat.h ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/bt8xx/compat.h +ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/cinergyT2/compat.h +ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/dvb-core/compat.h ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/video/compat.h patch -p0 <<'DIFF' -diff -u -p -r1.10 videodev.h ---- linux/include/linux/videodev.h 9 Oct 2005 03:06:09 -0000 1.10 -+++ linux/include/linux/videodev.h 10 Oct 2005 07:54:58 -0000 +diff -u -p videodev.h +--- linux/include/linux/videodev.h ++++ linux/include/linux/videodev.h @@ -1,6 +1,7 @@ #ifndef __LINUX_VIDEODEV_H #define __LINUX_VIDEODEV_H - + +#include "compat.h" - #include <linux/compiler.h> #include <linux/types.h> - + + #define HAVE_V4L1 1 diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile --- v4l/Makefile 2005-10-10 00:57:41.000000000 -0400 +++ v4l/Makefile 2005-10-10 00:58:26.000000000 -0400 -@@ -266,6 +266,7 @@ clean:: - find . -name '*.c' -type l -exec rm '{}' \; - find . -name '*.h' -type l -exec rm '{}' \; +@@ -407,6 +407,7 @@ clean:: + @find . -name '*.c' -type l -exec rm '{}' \; + @find . -name '*.h' -type l -exec rm '{}' \; -rm -f *~ *.o *.ko *.mod.c + @cd ..; patch -p0 -s -R -N < v4l/scripts/makelinks.sh |