diff options
| -rw-r--r-- | v4l/ChangeLog | 8 | ||||
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 10 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 10 |
3 files changed, 18 insertions, 10 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 37bf9413e..ffd82414a 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-11-02 00:39 mkrufky + + * ../v4l/scripts/merge-trees.sh: + * ../v4l/scripts/unmerge-trees.sh: + - fix fuzz & offsets. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-11-02 00:17 mkrufky * ../linux/drivers/media/video/saa6588.c: (block_to_buf): diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index fcbe09a0e..ebe995feb 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -48,7 +48,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) -@@ -171,7 +172,7 @@ export LC_ALL +@@ -173,7 +174,7 @@ export LC_ALL default:: links .version $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules @@ -56,8 +56,8 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile +links:: dvb-links @echo creating symbolic links... @find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \; - @find ../linux/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; -@@ -184,7 +185,7 @@ links:: + +@@ -185,7 +186,7 @@ links:: @find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \; @find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \; @@ -66,7 +66,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) -@@ -247,7 +248,7 @@ dvb-rminstall:: +@@ -251,7 +252,7 @@ dvb-rminstall:: $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null @echo @@ -75,7 +75,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) \ -@@ -268,7 +269,7 @@ rminstall:: +@@ -274,7 +275,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 90b2ee2ca..ed139f276 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -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) -@@ -172,7 +171,7 @@ export LC_ALL +@@ -174,7 +173,7 @@ export LC_ALL default:: links .version $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules @@ -37,8 +37,8 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile +links:: @echo creating symbolic links... @find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \; - @find ../linux/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; -@@ -185,7 +184,7 @@ links:: + +@@ -186,7 +185,7 @@ links:: @find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \; @find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \; @@ -47,7 +47,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) -@@ -248,7 +247,7 @@ dvb-rminstall:: +@@ -252,7 +251,7 @@ dvb-rminstall:: $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null @echo @@ -56,7 +56,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) \ -@@ -269,7 +268,7 @@ rminstall:: dvb-rminstall +@@ -275,7 +276,7 @@ rminstall:: dvb-rminstall rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) |