diff options
| author | Michael Krufky <devnull@localhost> | 2005-10-07 03:30:03 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-10-07 03:30:03 +0000 |
| commit | e8339068aa2efdc54e9eb32f6cd4fb912f6b49c9 (patch) | |
| tree | 7aef31dfb0c16f27cde98af63e4a8d98a39b9a55 /v4l/scripts/unmerge-trees.sh | |
| parent | 2e5537049876adeef37ff03010a6b082f920ae96 (diff) | |
| download | mediapointer-dvb-s2-e8339068aa2efdc54e9eb32f6cd4fb912f6b49c9.tar.gz mediapointer-dvb-s2-e8339068aa2efdc54e9eb32f6cd4fb912f6b49c9.tar.bz2 | |
re-diff'd Makefile patch
Diffstat (limited to 'v4l/scripts/unmerge-trees.sh')
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 2d8ef70bf..8147a483b 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -40,9 +40,9 @@ rm dvb_net.h rm dvb_frontend.h patch -p1 <<'DIFF' diff -up video4linux/Make.config video4linux.orig/Make.config ---- video4linux/Make.config 2005-08-28 12:31:17.000000000 +0000 -+++ video4linux.orig/Make.config 2005-08-28 12:00:10.000000000 +0000 -@@ -15,7 +15,6 @@ CONFIG_VIDEO_ALSA := n +--- video4linux/Make.config 2005-10-06 19:17:55.000000000 -0400 ++++ video4linux.orig/Make.config 2005-10-06 16:03:26.000000000 -0400 +@@ -18,7 +18,6 @@ CONFIG_VIDEO_ALSA := n CONFIG_VIDEO_CX88_DVB := n CONFIG_VIDEO_SAA7134_DVB := n @@ -50,7 +50,7 @@ diff -up video4linux/Make.config video4linux.orig/Make.config ifneq ($(KERNELRELEASE),) need_dvb = $(shell test $(SUBLEVEL) -ge 12 && echo yes) -@@ -24,6 +23,5 @@ endif +@@ -27,6 +26,5 @@ endif ifeq ($(need_dvb),yes) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m @@ -58,9 +58,9 @@ diff -up video4linux/Make.config video4linux.orig/Make.config endif diff -up video4linux/Makefile video4linux.orig/Makefile ---- video4linux/Makefile 2005-08-28 15:52:54.000000000 +0000 -+++ video4linux.orig/Makefile 2005-08-28 15:42:01.000000000 +0000 -@@ -47,10 +47,8 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o +--- video4linux/Makefile 2005-10-06 19:23:41.000000000 -0400 ++++ video4linux.orig/Makefile 2005-10-06 16:03:26.000000000 -0400 +@@ -50,10 +50,8 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o saa6588.o obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o @@ -73,7 +73,7 @@ diff -up video4linux/Makefile video4linux.orig/Makefile # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) -@@ -64,7 +62,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) +@@ -67,7 +65,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) endif # for DVB @@ -81,17 +81,17 @@ diff -up video4linux/Makefile video4linux.orig/Makefile EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) -@@ -143,9 +140,6 @@ inst_video += ir-kbd-gpio.ko ir-kbd-i2c. - inst_cx88 := cx8800.ko cx8802.ko cx88-alsa.ko +@@ -150,9 +147,6 @@ inst_cx88 := cx8800.ko cx8802.ko cx88-al inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko + inst_usb := em2820.ko -inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko -inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko -inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m)) -@@ -165,12 +159,6 @@ install:: rminstall +@@ -172,12 +166,6 @@ install:: rminstall -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common @@ -104,7 +104,7 @@ diff -up video4linux/Makefile video4linux.orig/Makefile -install -d $(KDIR26)/video -install -m 644 -c $(inst_video) $(KDIR26)/video -@@ -198,13 +186,11 @@ rminstall:: +@@ -208,14 +196,12 @@ rminstall:: -@rm -r $(DEST) \ $(addprefix $(KDIR26)/common/, $(inst_common)) \ $(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \ @@ -112,9 +112,10 @@ diff -up video4linux/Makefile video4linux.orig/Makefile $(addprefix $(KDIR26)/video/, $(inst_video)) \ $(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) \ $(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) \ + $(addprefix $(KDIRUSB)/, $(inst_usb)) \ $(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) \ $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) \ - $(addprefix $(KDIR26)/dvb/bt8xx/, $(addsuffix .gz,$(inst_bt8xx))) \ $(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) \ $(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) \ - $(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null + $(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null \ |