From 03fd6c50d68ef10f899577a933b760e10d90bac1 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sat, 18 Mar 2006 11:24:50 -0500 Subject: fix 'make kernel-links' for new and/or relocated source code From: Michael Krufky use 'find' to symlink compat.h into each directory in drivers/ and include/ instead of explicitly specifying each that needs compat.h This will remove the need to update v4l/scripts/makelinks.sh each time a new driver is introduced to the tree, and fixes it's current broken state. Signed-off-by: Michael Krufky --- v4l/scripts/makelinks.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'v4l') diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh index 44fa17759..981df1af8 100755 --- a/v4l/scripts/makelinks.sh +++ b/v4l/scripts/makelinks.sh @@ -37,15 +37,15 @@ for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do ln -v -f -s $PWD/$x $1/$x done -cd .. +for x in `find include -type d | grep -v CVS` ; do + ln -v -f -s $PWD/../v4l/compat.h $1/$x/compat.h +done -ln -v -f -s $PWD/v4l/compat.h $1/include/media/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/include/linux/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/common/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/bt8xx/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/cinergyT2/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/dvb-core/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/video/compat.h +for x in `find drivers/media -type d | grep -v CVS` ; do + ln -v -f -s $PWD/../v4l/compat.h $1/$x/compat.h +done + +cd .. patch -p0 <<'DIFF' diff -u -p videodev.h --- linux/include/linux/videodev.h -- cgit v1.2.3 From 883abfc44e00cd092b843f4831a229f54eb20844 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sat, 18 Mar 2006 14:44:06 -0500 Subject: make 'make kernel-links' less verbose From: Michael Krufky Signed-off-by: Michael Krufky --- v4l/scripts/makelinks.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'v4l') diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh index 981df1af8..a66989771 100755 --- a/v4l/scripts/makelinks.sh +++ b/v4l/scripts/makelinks.sh @@ -26,23 +26,23 @@ for x in `find include -type d | grep -v CVS` ; do done for x in `find Documentation -type f | grep -v CVS | grep -v .cvsignore` ; do - ln -v -f -s $PWD/$x $1/$x + ln -f -s $PWD/$x $1/$x done for x in `find drivers -type f | grep -v CVS | grep -v .cvsignore` ; do - ln -v -f -s $PWD/$x $1/$x + ln -f -s $PWD/$x $1/$x done for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do - ln -v -f -s $PWD/$x $1/$x + ln -f -s $PWD/$x $1/$x done for x in `find include -type d | grep -v CVS` ; do - ln -v -f -s $PWD/../v4l/compat.h $1/$x/compat.h + ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h done for x in `find drivers/media -type d | grep -v CVS` ; do - ln -v -f -s $PWD/../v4l/compat.h $1/$x/compat.h + ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h done cd .. -- cgit v1.2.3 From b644e387e9e256718cd9bc4dd916ba3bb6ad64f5 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 19 Mar 2006 11:22:02 -0500 Subject: insmod.sh updates From: Michael Krufky Fixes to make [load|unload|reload] as follows: - replaced saa711x with saa7115 - added pvrusb2 - added zl10353 - added mxb - added hexium_gemini - added hexium_orion - added cpia2 Signed-off-by: Michael Krufky --- v4l/scripts/insmod.sh | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'v4l') diff --git a/v4l/scripts/insmod.sh b/v4l/scripts/insmod.sh index e4ebb1494..96e5d7c0b 100755 --- a/v4l/scripts/insmod.sh +++ b/v4l/scripts/insmod.sh @@ -27,7 +27,7 @@ case "$1" in insmod ./cs53l32a.ko insmod ./wm8775.ko insmod ./cx25840.ko - insmod ./saa711x.ko + insmod ./saa7115.ko insmod ./btcx-risc.ko insmod ./saa7127.ko insmod ./msp3400.ko @@ -64,7 +64,9 @@ case "$1" in insmod ./sp887x.ko insmod ./or51211.ko insmod ./or51132.ko + insmod ./zl10353.ko insmod ./ttusbdecfe.ko + # saa7146 based siemens/technotrend/hauppauge cards insmod ./saa7146.ko insmod ./saa7146_vv.ko @@ -74,6 +76,9 @@ case "$1" in insmod ./budget.ko insmod ./budget-ci.ko insmod ./budget-av.ko + insmod ./mxb.ko + insmod ./hexium_gemini.ko + insmod ./hexium_orion.ko # technotrend/hauppauge USB things insmod ./dvb-ttusb-budget.ko insmod ./ttusb_dec.ko @@ -119,9 +124,11 @@ case "$1" in # insmod ./saa7134-oss.ko insmod ./saa7134-dvb.ko insmod ./saa7134-empress.ko - insmod ./saa6752hs.ko + insmod ./em28xx.ko + insmod ./pvrusb2.ko + insmod ./cpia2.ko insmod ./vivi.ko echo @@ -147,7 +154,7 @@ case "$1" in insmod ./cs53l32a.ko insmod ./wm8775.ko insmod ./cx25840.ko - insmod ./saa711x.ko + insmod ./saa7115.ko insmod ./btcx-risc.ko insmod ./saa7127.ko insmod ./msp3400.ko @@ -181,6 +188,7 @@ case "$1" in insmod ./sp887x.ko insmod ./or51211.ko insmod ./or51132.ko + insmod ./zl10353.ko insmod ./ttusbdecfe.ko insmod ./saa7146.ko insmod ./saa7146_vv.ko @@ -190,6 +198,9 @@ case "$1" in insmod ./budget.ko insmod ./budget-ci.ko insmod ./budget-av.ko + insmod ./mxb.ko + insmod ./hexium_gemini.ko + insmod ./hexium_orion.ko insmod ./dvb-ttusb-budget.ko insmod ./stv0297_cs2.ko insmod ./b2c2-flexcop.ko debug=0x01 @@ -231,9 +242,11 @@ case "$1" in insmod ./saa7134-oss.ko insmod ./saa7134-dvb.ko insmod ./saa7134-empress.ko - insmod ./saa6752hs.ko + insmod ./em28xx.ko + insmod ./pvrusb2.ko + insmod ./cpia2.ko insmod ./vivi.ko echo ;; @@ -249,10 +262,11 @@ case "$1" in # video4linux cards rmmod cx88-alsa cx88-blackbird cx88-dvb cx88-vp3054-i2c cx8802 cx8800 \ cx88xx saa7134-oss saa7134-alsa saa7134-empress saa7134-dvb \ - saa7134 dvb-bt8xx dst_ca dst bt878 bttv em28xx vivi + saa7134 dvb-bt8xx dst_ca dst bt878 bttv mxb \ + hexium_gemini hexium_orion em28xx pvrusb2 cpia2 vivi # frontends - rmmod dib3000mb dib3000mc dib3000_common nxt200x ves1x93 \ + rmmod dib3000mb zl10353 dib3000mc dib3000_common nxt200x ves1x93 \ sp8870 cx22700 stv0299 ves1820 cinergyT2 ttusbdecfe \ tda1004x l64781 tda8083 cx24110 cx22702 stv0297 \ tda10021 mt352 mt312 bcm3510 s5h1420 nxt6000 \ @@ -262,7 +276,7 @@ case "$1" in # chips and helpers rmmod saa7127 msp3400 tvp5150 \ saa6752hs saa6588 btcx-risc tveeprom tvaudio tda9887 tuner \ - ir-kbd-i2c ir-common cx25840 tvmixer cs53l32a wm8775 saa711x \ + ir-kbd-i2c ir-common cx25840 tvmixer cs53l32a wm8775 saa7115 \ saa7146_vv saa7146 video-buf-dvb video-buf \ v4l2-common v4l1-compat dvb-core videodev compat_ioctl32 -- cgit v1.2.3 From 415689adb6dd6eabcff5e6e3f267968aca7ff2c2 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 19 Mar 2006 11:35:51 -0500 Subject: whitespace cleanup From: Michael Krufky Signed-off-by: Michael Krufky --- v4l/scripts/insmod.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'v4l') diff --git a/v4l/scripts/insmod.sh b/v4l/scripts/insmod.sh index 96e5d7c0b..6a46cce0e 100755 --- a/v4l/scripts/insmod.sh +++ b/v4l/scripts/insmod.sh @@ -185,9 +185,9 @@ case "$1" in insmod ./nxt6000.ko insmod ./bcm3510.ko insmod ./s5h1420.ko - insmod ./sp887x.ko - insmod ./or51211.ko - insmod ./or51132.ko + insmod ./sp887x.ko + insmod ./or51211.ko + insmod ./or51132.ko insmod ./zl10353.ko insmod ./ttusbdecfe.ko insmod ./saa7146.ko -- cgit v1.2.3 From 5ba97bff5eae353cc41bae04e9041df6a7e4bc5f Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 19 Mar 2006 12:00:35 -0500 Subject: more insmod.sh updates From: Michael Krufky - added tda7432, tda9840, tda9875, tea6415c, tea6420 and bt832 Signed-off-by: Michael Krufky --- v4l/scripts/insmod.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'v4l') diff --git a/v4l/scripts/insmod.sh b/v4l/scripts/insmod.sh index 6a46cce0e..6efab6a82 100755 --- a/v4l/scripts/insmod.sh +++ b/v4l/scripts/insmod.sh @@ -32,6 +32,11 @@ case "$1" in insmod ./saa7127.ko insmod ./msp3400.ko insmod ./tvp5150.ko + insmod ./tda7432.ko + insmod ./tda9840.ko + insmod ./tda9875.ko + insmod ./tea6415c.ko + insmod ./tea6420.ko # DVB core insmod ./dvb-core.ko # dvb_net_debug=1 # for hybrid cx88 and saa7134 cards @@ -104,6 +109,7 @@ case "$1" in insmod ./dvb-usb-digitv.ko insmod ./dvb-usb-cxusb.ko # bt8xx + insmod ./bt832.ko insmod ./bttv.ko insmod ./bt878.ko insmod ./dst.ko @@ -159,6 +165,11 @@ case "$1" in insmod ./saa7127.ko insmod ./msp3400.ko insmod ./tvp5150.ko + insmod ./tda7432.ko + insmod ./tda9840.ko + insmod ./tda9875.ko + insmod ./tea6415c.ko + insmod ./tea6420.ko insmod ./dvb-core.ko cam_debug=1 insmod ./video-buf-dvb.ko insmod ./dvb-pll.ko @@ -222,6 +233,7 @@ case "$1" in insmod ./dvb-usb-digitv.ko insmod ./dvb-usb-cxusb.ko + insmod ./bt832.ko insmod ./bttv.ko insmod ./bt878.ko insmod ./dst.ko @@ -262,7 +274,7 @@ case "$1" in # video4linux cards rmmod cx88-alsa cx88-blackbird cx88-dvb cx88-vp3054-i2c cx8802 cx8800 \ cx88xx saa7134-oss saa7134-alsa saa7134-empress saa7134-dvb \ - saa7134 dvb-bt8xx dst_ca dst bt878 bttv mxb \ + saa7134 dvb-bt8xx dst_ca dst bt878 bttv bt832 mxb \ hexium_gemini hexium_orion em28xx pvrusb2 cpia2 vivi # frontends @@ -274,7 +286,7 @@ case "$1" in dvb-pll # chips and helpers - rmmod saa7127 msp3400 tvp5150 \ + rmmod saa7127 msp3400 tvp5150 tda7432 tda9840 tda9875 tea6415c tea6420 \ saa6752hs saa6588 btcx-risc tveeprom tvaudio tda9887 tuner \ ir-kbd-i2c ir-common cx25840 tvmixer cs53l32a wm8775 saa7115 \ saa7146_vv saa7146 video-buf-dvb video-buf \ -- cgit v1.2.3 From 61e1c1172158f6ba439d9e5ac4268bdeaa290d67 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 23 Mar 2006 22:02:58 -0500 Subject: report ivtv svn revision when using 'make ivtv' virtual merge build method From: Michael Krufky This is what I should have done in the first place. BEFORE: ivtv: version 0.7.0 (v4l-dvb + ivtv virtual merge) loading AFTER: ivtv: version 0.7.0 (v4l-dvb + ivtv virtual merge) Revision: 3207 loading Signed-off-by: Michael Krufky --- v4l/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'v4l') diff --git a/v4l/Makefile b/v4l/Makefile index fd757e928..ab94f891f 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -375,7 +375,9 @@ ivtv-links:: ivtv-checkout @find ivtv/i2c-drivers -name '*.[ch]' -type f -exec ln -sf '{}' . \; ivtv:: ivtv-links - @echo '#define IVTV_DRIVER_VERSION_COMMENT "(v4l-dvb + ivtv virtual merge)"' > ivtv-svnversion.h + @echo '#define IVTV_DRIVER_VERSION_COMMENT ' \ + '"(v4l-dvb + ivtv virtual merge)' \ + "`svn info ivtv | grep Revision`"'"' > ivtv-svnversion.h @echo ivtv trunk merged. Run make to build the entire tree. cx88-ivtv:: -- cgit v1.2.3 From 4a94881e9a2c8ffb02472f3727e88c108a3b1acf Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 25 Mar 2006 14:29:40 +0100 Subject: Fix typos. From: Hans Verkuil Signed-off-by: Hans Verkuil --- v4l/scripts/prep_commit_msg.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'v4l') diff --git a/v4l/scripts/prep_commit_msg.pl b/v4l/scripts/prep_commit_msg.pl index 9c4447313..ac958667b 100755 --- a/v4l/scripts/prep_commit_msg.pl +++ b/v4l/scripts/prep_commit_msg.pl @@ -20,8 +20,8 @@ if ( $user eq "" ) { $user="$name <$email>"; } -$first= "# Please change bellow if you are not patch author\n#\nFrom: $user"; -$out= "# At the end Signed-off-by: fields by patch author and commiter, at least\n#\nSigned-off-by: $user"; +$first= "# Please change below if you are not patch author\n#\nFrom: $user"; +$out= "# At the end Signed-off-by: fields by patch author and committer, at least\n#\nSigned-off-by: $user"; $from= "From: $user"; printf "#Added/removed/changed files:\n%s#\n" . @@ -29,6 +29,6 @@ printf "#Added/removed/changed files:\n%s#\n" . "# and before signed-off-by\n" . "# First line should be the subject, without Subject:\n#\n\n\n" . "# Now, patch author (just the main one), on a From: field\n" . - "# Please change bellow if the commiter is not the patch author\n#\n%s\n\n" . + "# Please change below if the committer is not the patch author\n#\n%s\n\n" . "# Then a detailed description:\n\n\n%s", $changed,$from,$out; -- cgit v1.2.3