Thanks, Chris, for including my previous patches in ivtv-0.3.7b.
This patch makes more improvements to the detection of interfering
modules.
- I added a new target "install-nocheck" for those who don't want the
checks done.
- I added a scan for modules with names like ivtv-*.ko and *-ivtv.ko
Various other versions of ivtv install modules with these
names. Thanks to Keith C. and Erik Toubro Nielsen for information
about Myth and Suse.
- The list of modules is no longer wired-in. This should improve
maintainability. The cost is speed: if there are n ivtv modules,
the check takes n times as long. This does not seem to be a
problem.
- the checks scan /lib/modules/$(KVER), not just
/lib/modules/$(KVER)/kernel. Brian Jackson: thanks for the
suggestion.
This is a patch to ivtv-0.3.7b.
===================================================================
RCS file: RCS/Makefile2.6,v
retrieving revision 1.1
diff -u -r1.1 Makefile2.6
--- Makefile2.6 2005/08/03 16:35:25 1.1
+++ Makefile2.6 2005/08/03 17:44:17
@@ -21,17 +21,28 @@
@echo "Any 'has no CRC' warnings are harmless and can be ignored."
@echo
-install: all
+install-nocheck: all
$(MAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=$(MDIR) \
$(CONFIG) -C $(KDIR) M=$(PWD) modules_install
- @ for m in ` find /lib/modules/$(KVER)/kernel -name msp3400.ko -o -name
tuner.ko -o -name tda9887.ko -o -name tveeprom.ko ` ; \
+
+install: install-nocheck
+ @# warn about modules with names like ivtv-* and *-ivtv
+ @ for m in ` find /lib/modules/$(KVER) -name 'ivtv-*.ko' -o -name
'*-ivtv.ko' ` ; \
+ do \
+ [ -f `basename "$$m" ` ] || echo "WARNING: old module $$m may
conflict with this installation of IVTV" ; \
+ done
+ @# warn about modules with the same name as ours but that are not ours
+ @ for nm in *.ko ; \
do \
- if ! cmp -s $$m `basename $$m` ; \
- then \
- echo "Module $$m conflicts with the ivtv module of the
same name -- please hide or delete it." ; \
- echo "To hide: mv $$m $$m.HIDE" ; \
- echo "You will then need to run depmod." ; \
- fi ; \
+ for om in ` find /lib/modules/$(KVER) -name "$$nm" ` ; \
+ do \
+ if ! cmp -s "$$om" "$$nm" ; \
+ then \
+ echo "WARNING: Module $$om conflicts with the
ivtv module of the same name -- please hide or delete it." ; \
+ echo "To hide: mv $$om $$om.HIDE" ; \
+ echo "You will then need to run depmod." ; \
+ fi ; \
+ done ; \
done
clean:
================ end of patch ================
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
ivtv-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ivtv-devel
