summaryrefslogtreecommitdiff
path: root/v4l/scripts
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-10-10 09:31:25 +0000
committerMichael Krufky <devnull@localhost>2005-10-10 09:31:25 +0000
commitea710d504d50292203ba496ef4c663ebc46b6986 (patch)
treecdc0c8a7b1bc11184cb6caa5bee0a33e0d3c0e0e /v4l/scripts
parentd5d9d828e88ef31c781c4809856065497072cb41 (diff)
downloadmediapointer-dvb-s2-ea710d504d50292203ba496ef4c663ebc46b6986.tar.gz
mediapointer-dvb-s2-ea710d504d50292203ba496ef4c663ebc46b6986.tar.bz2
* ../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>
Diffstat (limited to 'v4l/scripts')
-rw-r--r--v4l/scripts/makelinks.sh2
-rw-r--r--v4l/scripts/merge-trees.sh4
-rw-r--r--v4l/scripts/unmerge-trees.sh4
3 files changed, 5 insertions, 5 deletions
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)