for kernels 2.4+, install modules to kernel/drivers/[i2c,sensors]

instead of misc, and delete old modules in misc. This will prevent
      duplicate modules.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1351 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Mark D. Studebaker committed 2002-04-20 02:50:37 +00:00
1 parent 69e7d54d17
commit 39cc76464b
4 files changed
+42 -6

No files matched your search

+10 -1
View File
@@ -18,9 +18,18 @@ ask CVS about it:
-----------------------------------------------------------------------------
2.6.4 (2002????)
NOTE: Requires i2c-2.6.1 or newer, or kernel 2.4.13 or newer.
File doc/vid: New
File include/sensors_vid.h: New
Library: Add multiple VRM version support for w83781d
Makefiles: For 2.4+ kernels, modules now install in
kernel/drivers/[i2c,sensors] , not misc/ , and
removes old versions in misc/ .
Module i2c-savage4: new
Module i2c-viapro: Add support for VT8233A (0x3147)
Program sensors-detect: Add VT8233A, several S3 devices
Module w83781d: Add multiple VRM version support
Program mkpatch: Install new sensors_vid.h
Program sensors-detect: Add VT8233A, several S3 devices; fix perl warnings
2.6.3 (20020322)
NOTE: Requires i2c-2.6.1 or newer, or kernel 2.4.13 or newer.
+2 -1
View File
@@ -80,7 +80,8 @@ PREFIX := /usr/local
# This is the directory into which the modules will be installed.
# The magic invocation will return something like this:
# /lib/modules/2.2.15-ac9/misc
MODDIR := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`/misc
# MODDIR := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`/misc
MODPREF := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`
# This is the directory where sensors.conf will be installed, if no other
# configuration file is found
+15 -2
View File
@@ -76,10 +76,23 @@ INCLUDEFILES += $(KERNELBUSSESTARGETS:.o=.d)
all-kernel-busses: $(KERNELBUSSESTARGETS)
all :: all-kernel-busses
#
# If $MODPREF/kernel exists, we presume the new (2.4.0) /lib/modules/x.y.z directory
# layout, so we install in kernel/drivers/i2c/ and remove old versions in misc/
# Otherwise we install in misc/ as before.
#
install-kernel-busses: all-kernel-busses
if [ -n "$(KERNELBUSSESTARGETS)" ] ; then \
$(MKDIR) $(DESTDIR)$(MODDIR) ; \
$(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODDIR) ; \
if [ -d "$(DESTDIR)$(MODPREF)/kernel" ] ; then \
$(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \
$(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \
for i in $(KERNELBUSSESTARGETS) ; do \
$(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` ; \
done \
else \
$(MKDIR) $(DESTDIR)$(MODPREF)/misc ; \
$(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/misc ; \
fi \
fi
install :: install-kernel-busses
+15 -2
View File
@@ -113,10 +113,23 @@ INCLUDEFILES += $(KERNELCHIPSTARGETS:.o=.d)
all-kernel-chips: $(KERNELCHIPSTARGETS)
all :: all-kernel-chips
#
# If $MODPREF/kernel exists, we presume the new (2.4.0) /lib/modules/x.y.z directory
# layout, so we install in kernel/drivers/sensors/ and remove old versions in misc/
# Otherwise we install in misc/ as before.
#
install-kernel-chips: all-kernel-chips
if [ -n "$(KERNELCHIPSTARGETS)" ] ; then \
$(MKDIR) $(DESTDIR)$(MODDIR) ; \
$(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODDIR) ;\
if [ -d "$(DESTDIR)$(MODPREF)/kernel" ] ; then \
$(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/sensors ; \
$(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/sensors ; \
for i in $(KERNELCHIPSTARGETS) ; do \
$(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` ; \
done \
else \
$(MKDIR) $(DESTDIR)$(MODPREF)/misc ; \
$(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/misc ; \
fi \
fi
install :: install-kernel-chips