Changeset 1351

Show
Ignore:
Timestamp:
04/20/02 04:50:37 (7 years ago)
Author:
mds
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lm-sensors/trunk/CHANGES

    r1345 r1351  
    1919 
    20202.6.4 (2002????) 
     21  NOTE: Requires i2c-2.6.1 or newer, or kernel 2.4.13 or newer. 
     22  File doc/vid: New 
     23  File include/sensors_vid.h: New 
     24  Library: Add multiple VRM version support for w83781d 
     25  Makefiles: For 2.4+ kernels, modules now install in 
     26             kernel/drivers/[i2c,sensors] , not misc/ , and 
     27             removes old versions in misc/ . 
    2128  Module i2c-savage4: new 
    2229  Module i2c-viapro: Add support for VT8233A (0x3147) 
    23   Program sensors-detect: Add VT8233A, several S3 devices 
     30  Module w83781d: Add multiple VRM version support 
     31  Program mkpatch: Install new sensors_vid.h 
     32  Program sensors-detect: Add VT8233A, several S3 devices; fix perl warnings 
    2433 
    25342.6.3 (20020322) 

  • lm-sensors/trunk/Makefile

    r1108 r1351  
    8181# The magic invocation will return something like this: 
    8282#   /lib/modules/2.2.15-ac9/misc 
    83 MODDIR := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`/misc 
     83# MODDIR := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`/misc 
     84MODPREF := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'` 
    8485 
    8586# This is the directory where sensors.conf will be installed, if no other 

  • lm-sensors/trunk/kernel/busses/Module.mk

    r1345 r1351  
    7777all :: all-kernel-busses 
    7878 
     79# 
     80# If $MODPREF/kernel exists, we presume the new (2.4.0) /lib/modules/x.y.z directory 
     81# layout, so we install in kernel/drivers/i2c/ and remove old versions in misc/ 
     82# Otherwise we install in misc/ as before. 
     83# 
    7984install-kernel-busses: all-kernel-busses 
    8085        if [ -n "$(KERNELBUSSESTARGETS)" ] ; then \ 
    81           $(MKDIR) $(DESTDIR)$(MODDIR) ; \ 
    82           $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODDIR) ; \ 
     86          if [ -d "$(DESTDIR)$(MODPREF)/kernel" ] ; then \ 
     87            $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \ 
     88            $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \ 
     89            for i in $(KERNELBUSSESTARGETS) ; do \ 
     90              $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` ; \ 
     91            done \ 
     92          else \ 
     93            $(MKDIR) $(DESTDIR)$(MODPREF)/misc ; \ 
     94            $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/misc ; \ 
     95          fi \ 
    8396        fi 
    8497 

  • lm-sensors/trunk/kernel/chips/Module.mk

    r1243 r1351  
    114114all :: all-kernel-chips 
    115115 
     116# 
     117# If $MODPREF/kernel exists, we presume the new (2.4.0) /lib/modules/x.y.z directory 
     118# layout, so we install in kernel/drivers/sensors/ and remove old versions in misc/ 
     119# Otherwise we install in misc/ as before. 
     120# 
    116121install-kernel-chips: all-kernel-chips 
    117122        if [ -n "$(KERNELCHIPSTARGETS)" ] ; then \ 
    118           $(MKDIR) $(DESTDIR)$(MODDIR) ; \ 
    119           $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODDIR) ;\ 
     123          if [ -d "$(DESTDIR)$(MODPREF)/kernel" ] ; then \ 
     124            $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/sensors ; \ 
     125            $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/sensors ; \ 
     126            for i in $(KERNELCHIPSTARGETS) ; do \ 
     127              $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` ; \ 
     128            done \ 
     129          else \ 
     130            $(MKDIR) $(DESTDIR)$(MODPREF)/misc ; \ 
     131            $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/misc ; \ 
     132          fi \ 
    120133        fi 
    121134