diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 12 | ||||
| -rw-r--r-- | v4l/Makefile | 3 | ||||
| -rw-r--r-- | v4l/scripts/makelinks.sh | 2 | ||||
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 4 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 4 |
5 files changed, 18 insertions, 7 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 0d8049af7..621932758 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,15 @@ +2005-10-10 09:30 mkrufky + + * ../v4l/Makefile: + - removed unneeded line. + + * ../v4l/scripts/makelinks.sh: + * ../v4l/scripts/merge-trees.sh: + * ../v4l/scripts/unmerge-trees.sh: + - fixed offsets. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-10 09:05 mkrufky * ../v4l/Makefile: diff --git a/v4l/Makefile b/v4l/Makefile index bfcfb15a0..d3abd4b07 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -210,8 +210,7 @@ v4l_install:: rminstall /sbin/depmod -a kernel-links:: merge-trees - cd ..; v4l/scripts/makelinks.sh $(KDIR) \; - echo $(KDIR) + cd ..; v4l/scripts/makelinks.sh $(KDIR) merge-trees:: @scripts/merge-trees.sh diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh index 06d2fa748..557924c8b 100644 --- a/v4l/scripts/makelinks.sh +++ b/v4l/scripts/makelinks.sh @@ -71,7 +71,7 @@ diff -u -p -r1.10 videodev.h 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 -@@ -267,6 +267,7 @@ clean:: +@@ -266,6 +266,7 @@ clean:: find . -name '*.c' -type l -exec rm '{}' \; find . -name '*.h' -type l -exec rm '{}' \; -rm -f *~ *.o *.ko *.mod.c diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index c41f8eba8..e823ce2e9 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -55,7 +55,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile @echo -e "\nInstalling new V4L modules at corresponding Kernel dir..." @strip --strip-debug $(inst-m) -@@ -241,7 +242,7 @@ dvb-rminstall:: +@@ -240,7 +241,7 @@ dvb-rminstall:: $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null @echo @@ -64,7 +64,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile @echo -e "\nEliminating old V4L modules (errors on this step is not a problem).." -@rm -r $(DEST) \ -@@ -262,7 +263,7 @@ rminstall:: +@@ -261,7 +262,7 @@ rminstall:: rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index de1cf5143..6cc72d025 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -38,7 +38,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile @echo -e "\nInstalling new V4L modules at corresponding Kernel dir..." @strip --strip-debug $(inst-m) -@@ -242,7 +241,7 @@ dvb-rminstall:: +@@ -241,7 +240,7 @@ dvb-rminstall:: $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null @echo @@ -47,7 +47,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile @echo -e "\nEliminating old V4L modules (errors on this step is not a problem).." -@rm -r $(DEST) \ -@@ -263,7 +262,7 @@ rminstall:: dvb-rminstall +@@ -262,7 +261,7 @@ rminstall:: dvb-rminstall rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) |