diff options
| -rw-r--r-- | v4l/ChangeLog | 10 | ||||
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 8 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 8 |
3 files changed, 17 insertions, 9 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index b643e20f9..2ef9ab1d0 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,4 +1,12 @@ -2005-10-09 16:55 mkrufky +2005-10-09 21:04 mkrufky + + * ../v4l/scripts/merge-trees.sh: + * ../v4l/scripts/unmerge-trees.sh: + - fix fuzz & offsets. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + +2005-10-09 20:55 mkrufky * ../v4l/Makefile: - clean up 'make links' build output. diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 61b304cb4..1b9fe0bb3 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -46,16 +46,16 @@ 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) -@@ -176,7 +177,7 @@ links:: +@@ -177,7 +178,7 @@ links:: - ln -sf ../linux/drivers/media/common/ir-common.c . + @ln -sf ../linux/drivers/media/common/ir-common.c . -install:: rminstall +install:: rminstall dvb-install @echo -e "\nInstalling new V4L modules at corresponding Kernel dir..." @strip --strip-debug $(inst-m) -@@ -236,7 +237,7 @@ dvb-rminstall:: +@@ -237,7 +238,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) \ -@@ -257,7 +258,7 @@ rminstall:: +@@ -258,7 +259,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 98e1716e2..dfb45daec 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -29,16 +29,16 @@ 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) -@@ -177,7 +176,7 @@ links:: +@@ -178,7 +177,7 @@ links:: - ln -sf ../linux/drivers/media/common/ir-common.c . + @ln -sf ../linux/drivers/media/common/ir-common.c . -install:: rminstall dvb-install +install:: rminstall @echo -e "\nInstalling new V4L modules at corresponding Kernel dir..." @strip --strip-debug $(inst-m) -@@ -237,7 +236,7 @@ dvb-rminstall:: +@@ -238,7 +237,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) \ -@@ -258,7 +257,7 @@ rminstall:: dvb-rminstall +@@ -259,7 +258,7 @@ rminstall:: dvb-rminstall rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) |