summaryrefslogtreecommitdiff
path: root/v4l/scripts/unmerge-trees.sh
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-10-10 09:21:29 +0000
committerMichael Krufky <devnull@localhost>2005-10-10 09:21:29 +0000
commitd5d9d828e88ef31c781c4809856065497072cb41 (patch)
treeddaa30af236ecc40b8280c2905da5994c613913f /v4l/scripts/unmerge-trees.sh
parent68c78ec14f59773d86ac8ed293819325655147b8 (diff)
downloadmediapointer-dvb-s2-d5d9d828e88ef31c781c4809856065497072cb41.tar.gz
mediapointer-dvb-s2-d5d9d828e88ef31c781c4809856065497072cb41.tar.bz2
- Alternative build method: 'make kernel-links'
based on 'makelinks' script in dvb-kernel cvs. - Symlink cvs code into kernel source in order to build cvs code inside kernel build. - Currently requires merged-trees, because of some missing files in v4l-kernel cvs, present in dvb-kernel cvs, such as Makefile - 'make kernel-links' will automatically call 'make merge-trees' - Currently requires a patch to linux/include/linux/videodev.h, which adds #include "compat.h" Patch is applied during 'make kernel-links' and is removed during 'make clean' - videodev.h patch and merge-trees dependency can be removed in the future. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l/scripts/unmerge-trees.sh')
-rw-r--r--v4l/scripts/unmerge-trees.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index 9d8bd69bf..de1cf5143 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)
-@@ -238,7 +237,7 @@ dvb-rminstall::
+@@ -242,7 +241,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) \
-@@ -259,7 +258,7 @@ rminstall:: dvb-rminstall
+@@ -263,7 +262,7 @@ rminstall:: dvb-rminstall
rmmodules::
rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)