diff options
| author | Michael Krufky <devnull@localhost> | 2005-10-19 00:45:47 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-10-19 00:45:47 +0000 |
| commit | 9c60e04085bbfe5cf2eb699d0e070efbf1171389 (patch) | |
| tree | e422a23972dc84b0bc79874d190417714e9275e6 | |
| parent | daeb177682b382a9f5b09fb619a46f0aaee23270 (diff) | |
| download | mediapointer-dvb-s2-9c60e04085bbfe5cf2eb699d0e070efbf1171389.tar.gz mediapointer-dvb-s2-9c60e04085bbfe5cf2eb699d0e070efbf1171389.tar.bz2 | |
- Tree-merge enabled once again.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
| -rw-r--r-- | v4l/ChangeLog | 8 | ||||
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 13 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 13 |
3 files changed, 30 insertions, 4 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 85cbf76be..91af2bc8e 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-10-19 00:44 mkrufky + + * ../v4l/scripts/merge-trees.sh: + * ../v4l/scripts/unmerge-trees.sh: + - Tree-merge enabled once again. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-19 00:20 mkrufky * ../v4l/Makefile: diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 9ef965988..fcbe09a0e 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -48,9 +48,18 @@ 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) -@@ -184,7 +185,7 @@ links:: +@@ -171,7 +172,7 @@ export LC_ALL + default:: links .version + $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules - @ln -sf ../linux/drivers/media/common/ir-common.c . +-links:: ++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:: + @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 '{}' . \; -install:: rminstall +install:: rminstall dvb-install diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index ae5f60648..90b2ee2ca 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -29,9 +29,18 @@ 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) -@@ -185,7 +184,7 @@ links:: +@@ -172,7 +171,7 @@ export LC_ALL + default:: links .version + $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules - @ln -sf ../linux/drivers/media/common/ir-common.c . +-links:: dvb-links ++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:: + @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 '{}' . \; -install:: rminstall dvb-install +install:: rminstall |