diff options
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 9 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 3f8a53aaa..61b304cb4 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -23,12 +23,11 @@ for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do done cd $CWD -echo . patch -p2 <<'DIFF' diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config --- v4l-kernel.orig/v4l/Make.config 2005-10-08 17:31:57.000000000 -0400 +++ v4l-kernel/v4l/Make.config 2005-10-08 17:46:08.000000000 -0400 -@@ -32,5 +32,7 @@ endif +@@ -33,5 +33,7 @@ endif ifeq ($(need_dvb),yes) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m @@ -47,7 +46,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) -@@ -173,7 +174,7 @@ links:: +@@ -176,7 +177,7 @@ links:: ln -sf ../linux/drivers/media/common/ir-common.c . @@ -56,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) -@@ -233,7 +234,7 @@ dvb-rminstall:: +@@ -236,7 +237,7 @@ dvb-rminstall:: $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null @echo @@ -65,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) \ -@@ -254,7 +255,7 @@ rminstall:: +@@ -257,7 +258,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 2b67e4c7b..98e1716e2 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -10,7 +10,7 @@ patch -p2 <<'DIFF' diff -up v4l-kernel/v4l/Make.config v4l-kernel.orig/v4l/Make.config --- v4l-kernel/v4l/Make.config 2005-10-08 17:46:08.000000000 -0400 +++ v4l-kernel.orig/v4l/Make.config 2005-10-08 17:31:57.000000000 -0400 -@@ -32,7 +32,5 @@ endif +@@ -33,7 +33,5 @@ endif ifeq ($(need_dvb),yes) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m @@ -29,7 +29,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) -@@ -174,7 +173,7 @@ links:: +@@ -177,7 +176,7 @@ links:: ln -sf ../linux/drivers/media/common/ir-common.c . @@ -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) -@@ -234,7 +233,7 @@ dvb-rminstall:: +@@ -237,7 +236,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) \ -@@ -255,7 +254,7 @@ rminstall:: dvb-rminstall +@@ -258,7 +257,7 @@ rminstall:: dvb-rminstall rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) |