- 2.8.0, updated make patch; BR+R i2c 2.8.0

  (warning: using with old i2c means Oops!)
- renamed kernel*-misc-* to kernel*-i2c-*
- fixed .init (note that _modprobe displays its own message)

Changed files:
    lm_sensors-make.patch -> 1.7
    lm_sensors.spec -> 1.98
    sensors.init -> 1.13

diff --git a/lm_sensors-make.patch b/lm_sensors-make.patch
index 83ed1b11c083d39857ddb0c6eae7b3b9884ea375..b588e0566061a0788e1ab3caffb41f1fb1015079 100644 (file)
--- a/lm_sensors-make.patch
+++ b/lm_sensors-make.patch
@@ -1,20 +1,6 @@
-diff -urN lm_sensors-2.6.5.orig/Makefile lm_sensors-2.6.5/Makefile
---- lm_sensors-2.6.5.orig/Makefile     Sun Sep 22 13:29:54 2002
-+++ lm_sensors-2.6.5/Makefile  Sun Sep 22 13:30:32 2002
-@@ -170,8 +170,9 @@
- # PROGCPPFLAGS/PROGCFLAGS is to create non-kernel object files (which are linked into executables).
- # ARCPPFLAGS/ARCFLAGS are used to create archive object files (static libraries).
- # LIBCPPFLAGS/LIBCFLAGS are for shared library objects.
-+OPTS=-O2
- ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS)
--ALL_CFLAGS := -O2 
-+ALL_CFLAGS := $(OPTS)
- 
- ifeq ($(DEBUG),1)
- ALL_CPPFLAGS += -DDEBUG
-diff -urN lm_sensors-2.6.5.orig/etc/Module.mk lm_sensors-2.6.5/etc/Module.mk
---- lm_sensors-2.6.5.orig/etc/Module.mk        Sun Sep 22 13:29:54 2002
-+++ lm_sensors-2.6.5/etc/Module.mk     Sun Sep 22 13:30:32 2002
+diff -Nur lm_sensors-2.8.0.orig/etc/Module.mk lm_sensors-2.8.0/etc/Module.mk
+--- lm_sensors-2.8.0.orig/etc/Module.mk        2003-06-28 22:04:51.000000000 +0200
++++ lm_sensors-2.8.0/etc/Module.mk     2003-07-25 23:13:42.000000000 +0200
 @@ -29,7 +29,7 @@
  install-etc:
        $(MKDIR) $(DESTDIR)$(ETCDIR)
@@ -22,62 +8,36 @@ diff -urN lm_sensors-2.6.5.orig/etc/Module.mk lm_sensors-2.6.5/etc/Module.mk
 -        $(INSTALL) -o  root -g root -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL); \
 +        $(INSTALL) -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL); \
        fi
- install :: install-etc
+ user_install :: install-etc
  
-diff -urN lm_sensors-2.6.5.orig/kernel/Module.mk lm_sensors-2.6.5/kernel/Module.mk
---- lm_sensors-2.6.5.orig/kernel/Module.mk     Sun Sep 22 13:29:54 2002
-+++ lm_sensors-2.6.5/kernel/Module.mk  Sun Sep 22 13:30:32 2002
-@@ -39,7 +39,7 @@
- install-kernel: all-kernel
-       if [ -n "$(KERNELTARGETS)" ] ; then \
-         $(MKDIR) $(DESTDIR)$(MODDIR) ; \
--        $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\
-+        $(INSTALL) -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\
-       fi
-       $(RM) $(DESTDIR)$(MODDIR)/sensors.o
- 
-diff -urN lm_sensors-2.6.5.orig/kernel/busses/Module.mk lm_sensors-2.6.5/kernel/busses/Module.mk
---- lm_sensors-2.6.5.orig/kernel/busses/Module.mk      Sun Sep 22 13:29:54 2002
-+++ lm_sensors-2.6.5/kernel/busses/Module.mk   Sun Sep 22 13:30:32 2002
-@@ -90,13 +90,13 @@
+diff -Nur lm_sensors-2.8.0.orig/kernel/busses/Module.mk lm_sensors-2.8.0/kernel/busses/Module.mk
+--- lm_sensors-2.8.0.orig/kernel/busses/Module.mk      2003-06-14 21:25:19.000000000 +0200
++++ lm_sensors-2.8.0/kernel/busses/Module.mk   2003-07-25 23:14:06.000000000 +0200
+@@ -105,7 +105,7 @@
+ install-kernel-busses: all-kernel-busses
        if [ -n "$(KERNELBUSSESTARGETS)" ] ; then \
-         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 ; \
-+          $(INSTALL) -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 ; \
-+          $(INSTALL) -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/misc ; \
-         fi \
-       fi
- 
-diff -urN lm_sensors-2.6.5.orig/kernel/chips/Module.mk lm_sensors-2.6.5/kernel/chips/Module.mk
---- lm_sensors-2.6.5.orig/kernel/chips/Module.mk       Sun Sep 22 13:29:54 2002
-+++ lm_sensors-2.6.5/kernel/chips/Module.mk    Sun Sep 22 13:30:32 2002
-@@ -137,13 +137,13 @@
+         $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
+-        $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
++        $(INSTALL) -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
+         for i in $(KERNELBUSSESTARGETS) ; do \
+           $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/`basename $$i` \
+                 $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/`basename $$i`.gz $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses/`basename $$i`.gz ; \
+diff -Nur lm_sensors-2.8.0.orig/kernel/chips/Module.mk lm_sensors-2.8.0/kernel/chips/Module.mk
+--- lm_sensors-2.8.0.orig/kernel/chips/Module.mk       2003-07-03 19:27:09.000000000 +0200
++++ lm_sensors-2.8.0/kernel/chips/Module.mk    2003-07-25 23:14:11.000000000 +0200
+@@ -149,7 +149,7 @@
+ install-kernel-chips: all-kernel-chips
        if [ -n "$(KERNELCHIPSTARGETS)" ] ; then \
-         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 ; \
-+          $(INSTALL) -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 ; \
-+          $(INSTALL) -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/misc ; \
-         fi \
-       fi
- 
-diff -urN lm_sensors-2.6.5.orig/kernel/include/Module.mk lm_sensors-2.6.5/kernel/include/Module.mk
---- lm_sensors-2.6.5.orig/kernel/include/Module.mk     Sun Sep 22 13:29:54 2002
-+++ lm_sensors-2.6.5/kernel/include/Module.mk  Sun Sep 22 13:30:32 2002
-@@ -33,7 +33,7 @@
+         $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
+-        $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
++        $(INSTALL) -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
+         for i in $(KERNELCHIPSTARGETS) ; do \
+           $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/kernel/drivers/sensors/`basename $$i` \
+                 $(DESTDIR)$(MODPREF)/kernel/drivers/sensors/`basename $$i`.gz $(DESTDIR)$(MODPREF)/kernel/drivers/chips/`basename $$i`.gz ; \
+diff -Nur lm_sensors-2.8.0.orig/kernel/include/Module.mk lm_sensors-2.8.0/kernel/include/Module.mk
+--- lm_sensors-2.8.0.orig/kernel/include/Module.mk     2003-06-28 23:56:08.000000000 +0200
++++ lm_sensors-2.8.0/kernel/include/Module.mk  2003-07-25 23:14:18.000000000 +0200
+@@ -38,7 +38,7 @@
  install-all-kernel-include:
        if [ -n "$(KERNELINCLUDEFILES)" ] ; then \
          $(MKDIR) $(DESTDIR)$(SYSINCLUDEDIR) ; \
@@ -85,18 +45,35 @@ diff -urN lm_sensors-2.6.5.orig/kernel/include/Module.mk lm_sensors-2.6.5/kernel
 +        $(INSTALL) -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) ; \
        fi
  
- install :: install-all-kernel-include
-diff -urN lm_sensors-2.6.5.orig/lib/Module.mk lm_sensors-2.6.5/lib/Module.mk
---- lm_sensors-2.6.5.orig/lib/Module.mk        Sun Sep 22 13:29:54 2002
-+++ lm_sensors-2.6.5/lib/Module.mk     Sun Sep 22 13:30:32 2002
-@@ -87,12 +87,12 @@
- 
- install-lib: all-lib
-       $(MKDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(LIBINCLUDEDIR) $(DESTDIR)$(LIBMAN3DIR) $(DESTDIR)$(LIBMAN5DIR)
+ user_install :: install-all-kernel-include
+diff -Nur lm_sensors-2.8.0.orig/kernel/Module.mk lm_sensors-2.8.0/kernel/Module.mk
+--- lm_sensors-2.8.0.orig/kernel/Module.mk     2003-05-31 17:48:28.000000000 +0200
++++ lm_sensors-2.8.0/kernel/Module.mk  2003-07-25 23:13:59.000000000 +0200
+@@ -39,7 +39,7 @@
+ install-kernel: all-kernel
+ #     if [ -n "$(KERNELTARGETS)" ] ; then \
+ #       $(MKDIR) $(DESTDIR)$(MODDIR) ; \
+-#       $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\
++#       $(INSTALL) -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\
+ #     fi
+       $(RM) $(DESTDIR)$(MODPREF)/misc/sensors.o
+ 
+diff -Nur lm_sensors-2.8.0.orig/lib/Module.mk lm_sensors-2.8.0/lib/Module.mk
+--- lm_sensors-2.8.0.orig/lib/Module.mk        2003-07-08 14:47:41.000000000 +0200
++++ lm_sensors-2.8.0/lib/Module.mk     2003-07-25 23:16:02.000000000 +0200
+@@ -106,7 +106,7 @@
+                echo '         Run the following command: /sbin/ldconfig' ; \
+            echo '******************************************************************************' ; \
+       fi
 -      $(INSTALL) -o root -g root -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR)
 +      $(INSTALL) -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR)
        $(LN) $(LIBSHLIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBSHSONAME)
        $(LN) $(LIBSHSONAME) $(DESTDIR)$(LIBDIR)/$(LIBSHBASENAME)
+       @if [ "$(DESTDIR)$(LIBDIR)" != "/usr/lib" -a "$(DESTDIR)$(LIBDIR)" != "/lib" ] ; then \
+@@ -128,9 +128,9 @@
+                 echo '         Add it and run /sbin/ldconfig for the userspace tools to work.' ; \
+                 echo '******************************************************************************' ) ; \
+       fi
 -      $(INSTALL) -o root -g root -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR)
 -      $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR)
 -      $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR)
@@ -104,37 +81,78 @@ diff -urN lm_sensors-2.6.5.orig/lib/Module.mk lm_sensors-2.6.5/lib/Module.mk
 +      $(INSTALL) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR)
 +      $(INSTALL) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR)
  
- install :: install-lib
  
-diff -urN lm_sensors-2.6.5.orig/prog/detect/Module.mk lm_sensors-2.6.5/prog/detect/Module.mk
---- lm_sensors-2.6.5.orig/prog/detect/Module.mk        Sun Sep 22 13:29:54 2002
-+++ lm_sensors-2.6.5/prog/detect/Module.mk     Sun Sep 22 13:30:32 2002
-@@ -37,7 +37,7 @@
+ user_install :: install-lib
+diff -Nur lm_sensors-2.8.0.orig/Makefile lm_sensors-2.8.0/Makefile
+--- lm_sensors-2.8.0.orig/Makefile     2003-07-08 11:06:50.000000000 +0200
++++ lm_sensors-2.8.0/Makefile  2003-07-25 23:13:29.000000000 +0200
+@@ -186,7 +186,8 @@
+ # ARCPPFLAGS/ARCFLAGS are used to create archive object files (static libraries).
+ # LIBCPPFLAGS/LIBCFLAGS are for shared library objects.
+ ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS)
+-ALL_CFLAGS := -Wall -O2 
++OPTS = -O2
++ALL_CFLAGS := -Wall $(OPTS)
+ 
+ ifeq ($(DEBUG),1)
+ ALL_CPPFLAGS += -DDEBUG
+diff -Nur lm_sensors-2.8.0.orig/prog/detect/Module.mk lm_sensors-2.8.0/prog/detect/Module.mk
+--- lm_sensors-2.8.0.orig/prog/detect/Module.mk        2003-07-07 12:44:29.000000000 +0200
++++ lm_sensors-2.8.0/prog/detect/Module.mk     2003-07-25 23:16:42.000000000 +0200
+@@ -37,9 +37,9 @@
  
  install-prog-detect: all-prog-detect
        mkdir -p $(DESTDIR)$(SBINDIR)
 -      $(INSTALL) -o root -g root -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR)
 +      $(INSTALL) -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR)
- install :: install-prog-detect
+       if [ ! -e $(DESTDIR)$(SBINDIR)/dmidecode -o $(DESTDIR)$(SBINDIR)/dmidecode -ot $(PROGDETECTDIR)/dmidecode.c ] ; then \
+-        $(INSTALL) -o root -g root -m 755 $(PROGDETECTDIR)/dmidecode $(DESTDIR)$(SBINDIR) ; \
++        $(INSTALL) -m 755 $(PROGDETECTDIR)/dmidecode $(DESTDIR)$(SBINDIR) ; \
+       fi
+ user_install :: install-prog-detect
  
- clean-prog-detect:
-diff -urN lm_sensors-2.6.5.orig/prog/dump/Module.mk lm_sensors-2.6.5/prog/dump/Module.mk
---- lm_sensors-2.6.5.orig/prog/dump/Module.mk  Sun Sep 22 13:29:54 2002
-+++ lm_sensors-2.6.5/prog/dump/Module.mk       Sun Sep 22 13:49:15 2002
+diff -Nur lm_sensors-2.8.0.orig/prog/dump/Module.mk lm_sensors-2.8.0/prog/dump/Module.mk
+--- lm_sensors-2.8.0.orig/prog/dump/Module.mk  2003-06-28 22:04:50.000000000 +0200
++++ lm_sensors-2.8.0/prog/dump/Module.mk       2003-07-25 23:16:50.000000000 +0200
 @@ -39,7 +39,7 @@
  
  install-prog-dump: all-prog-dump
        mkdir -p $(DESTDIR)$(SBINDIR)
 -      $(INSTALL) -o root -g root -m 755 $(PROGDUMPBININSTALL) $(DESTDIR)$(SBINDIR)
 +      $(INSTALL) -m 755 $(PROGDUMPBININSTALL) $(DESTDIR)$(SBINDIR)
- install :: install-prog-dump
+ user_install :: install-prog-dump
  
  clean-prog-dump:
-diff -urN lm_sensors-2.6.5.orig/prog/rrd/Makefile lm_sensors-2.6.5/prog/rrd/Makefile
---- lm_sensors-2.6.5.orig/prog/rrd/Makefile    Sun Sep 22 13:29:54 2002
-+++ lm_sensors-2.6.5/prog/rrd/Makefile Sun Sep 22 13:31:17 2002
-@@ -41,10 +41,10 @@
-       install -d -o $(USER) -m 777 $(APACHDIR)/pix
+diff -Nur lm_sensors-2.8.0.orig/prog/hotplug/Makefile lm_sensors-2.8.0/prog/hotplug/Makefile
+--- lm_sensors-2.8.0.orig/prog/hotplug/Makefile        2003-05-31 19:30:47.000000000 +0200
++++ lm_sensors-2.8.0/prog/hotplug/Makefile     2003-07-25 23:17:07.000000000 +0200
+@@ -18,7 +18,7 @@
+       $(CC) $(CFLAGS) -c $< -o $@
+ 
+ install: all
+-      install -o root -g root -m 644 $(OBJS) /lib/modules/$(VER)/kernel/drivers/i2c/busses
++      install -m 644 $(OBJS) /lib/modules/$(VER)/kernel/drivers/i2c/busses
+ 
+ clean:
+       rm -f $(OBJS)
+diff -Nur lm_sensors-2.8.0.orig/prog/rrd/Makefile lm_sensors-2.8.0/prog/rrd/Makefile
+--- lm_sensors-2.8.0.orig/prog/rrd/Makefile    2002-01-05 16:39:17.000000000 +0100
++++ lm_sensors-2.8.0/prog/rrd/Makefile 2003-07-25 23:17:50.000000000 +0200
+@@ -22,7 +22,7 @@
+       sed -e "s#%%RRDPATH%%#$(RRDPATH)#g;s#%%APACHDIR%%#$(APACHDIR)#g;s#%%RRDDIR%%#$(RRDDIR)#g;s#%%MACH%%#$(MACH)#g" $< > $@
+ 
+ $(RRDDIR) :
+-      install -d -o $(USER) $(RRDDIR)
++      install -d $(RRDDIR)
+ 
+ $(RRDB) : $(RRDDIR)
+       ./sens_create_rrd $(RRDB)
+@@ -38,13 +38,13 @@
+       $(error error - Web server directory $(APACHE) not present - check APACHE definition in Makefile)
+ 
+ $(APACHDIR)/pix : $(APACHE)
+-      install -d -o $(USER) -m 777 $(APACHDIR)/pix
++      install -d -m 777 $(APACHDIR)/pix
  
  install: all $(RRDB) $(SENSDIR) $(CRONTAB) $(APACHDIR)/pix
 -      install -o root -g root -m 755 sens_update_rrd $(BINPATH)
@@ -148,9 +166,9 @@ diff -urN lm_sensors-2.6.5.orig/prog/rrd/Makefile lm_sensors-2.6.5/prog/rrd/Make
  #     grep sens_update_rrd $(CRONTAB) > /dev/null 2>&1 || echo '*/5 * * * *   /usr/local/bin/sens_update_rrd' $(RRDB) $(SENSDEV) >> $(CRONTAB)
        @echo
        @echo Note!!! You must manually install the following line in the crontab for user $(USER):
-diff -urN lm_sensors-2.6.5.orig/prog/sensord/Module.mk lm_sensors-2.6.5/prog/sensord/Module.mk
---- lm_sensors-2.6.5.orig/prog/sensord/Module.mk       Sun Sep 22 13:29:54 2002
-+++ lm_sensors-2.6.5/prog/sensord/Module.mk    Sun Sep 22 13:30:32 2002
+diff -Nur lm_sensors-2.8.0.orig/prog/sensord/Module.mk lm_sensors-2.8.0/prog/sensord/Module.mk
+--- lm_sensors-2.8.0.orig/prog/sensord/Module.mk       2003-06-28 22:04:50.000000000 +0200
++++ lm_sensors-2.8.0/prog/sensord/Module.mk    2003-07-25 23:18:02.000000000 +0200
 @@ -45,8 +45,8 @@
  
  install-prog-sensord: all-prog-sensord
@@ -159,12 +177,12 @@ diff -urN lm_sensors-2.6.5.orig/prog/sensord/Module.mk lm_sensors-2.6.5/prog/sen
 -      $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR)
 +      $(INSTALL) -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR)
 +      $(INSTALL) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR)
- install :: install-prog-sensord
+ user_install :: install-prog-sensord
  
  clean-prog-sensord:
-diff -urN lm_sensors-2.6.5.orig/prog/sensors/Module.mk lm_sensors-2.6.5/prog/sensors/Module.mk
---- lm_sensors-2.6.5.orig/prog/sensors/Module.mk       Sun Sep 22 13:29:54 2002
-+++ lm_sensors-2.6.5/prog/sensors/Module.mk    Sun Sep 22 13:30:32 2002
+diff -Nur lm_sensors-2.8.0.orig/prog/sensors/Module.mk lm_sensors-2.8.0/prog/sensors/Module.mk
+--- lm_sensors-2.8.0.orig/prog/sensors/Module.mk       2003-06-28 22:04:50.000000000 +0200
++++ lm_sensors-2.8.0/prog/sensors/Module.mk    2003-07-25 23:18:14.000000000 +0200
 @@ -41,8 +41,8 @@
  
  install-prog-sensors: all-prog-sensors
@@ -173,6 +191,6 @@ diff -urN lm_sensors-2.6.5.orig/prog/sensors/Module.mk lm_sensors-2.6.5/prog/sen
 -      $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR)
 +      $(INSTALL) -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR)
 +      $(INSTALL) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR)
- install :: install-prog-sensors
+ user_install :: install-prog-sensors
  
  clean-prog-sensors:

diff --git a/lm_sensors.spec b/lm_sensors.spec
index 4033c85768ee0acff31c9c23b70d850c0b409719..a7089d1da3d6dce9dc239d2e04cc0ba6d90d319c 100644 (file)
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -11,7 +11,7 @@ Summary(pt_BR):       Ferramentas para monitora
 Summary(ru):   õÔÉÌÉÔÙ ÄÌÑ ÍÏÎÉÔÏÒÉÎÇÁ ÁÐÐÁÒÁÔÕÒÙ
 Summary(uk):   õÔÉ̦ÔÉ ÄÌÑ ÍÏΦÔÏÒÉÎÇÕ ÁÐÁÒÁÔÕÒÉ
 Name:          lm_sensors
-Version:       2.7.0
+Version:       2.8.0
 %define _rel   1
 Release:       %{_rel}
 License:       GPL
@@ -29,7 +29,7 @@ BuildRequires:        perl-modules >= 5.6
 BuildRequires: rpm-perlprov >= 3.0.3-16
 BuildRequires: rpmbuild(macros) >= 1.118
 BuildRequires: rrdtool-devel
-%{!?_without_dist_kernel:BuildRequires:        i2c-devel >= 2.7.0}
+%{!?_without_dist_kernel:BuildRequires:        i2c-devel >= 2.8.0}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     liblm_sensors1
 
@@ -125,38 +125,40 @@ Bibliotecas est
 ðÁËÅÔ lm_sensors-static ͦÓÔÉÔØ ÓÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ, ÎÅÏÂȦÄΦ ÄÌÑ
 ÐÏÂÕÄÏ×É ÐÒÏÇÒÁÍ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÄÁΦ ÓÅÎÓÏÒ¦×.
 
-%package -n kernel-misc-%{name}
+%package -n kernel-i2c-%{name}
 Summary:       Kernel modules for various buses and monitor chips
 Summary(pl):   Modu³y j±dra dla ró¿nego rodzaju sensorów
 Group:         Applications/System
 Release:       %{_rel}@%{_kernel_ver_str}
 Requires(post,postun): /sbin/depmod
 %{!?_without_dist_kernel:%requires_releq_kernel_up}
-%{!?_without_dist_kernel:Requires:     i2c >= 2.7.0}
+%{!?_without_dist_kernel:Requires:     i2c >= 2.8.0}
 Provides:      %{name}-modules = %{version}
 Obsoletes:     %{name}-modules
+Obsoletes:     kernel-misc-lm_sensors
 
-%description -n kernel-misc-%{name}
+%description -n kernel-i2c-%{name}
 Kernel modules for various buses and monitor chips.
 
-%description -n kernel-misc-%{name} -l pl
+%description -n kernel-i2c-%{name} -l pl
 Modu³y j±dra dla ró¿nego rodzaju sensorów monitoruj±cych.
 
-%package -n kernel-smp-misc-%{name}
+%package -n kernel-smp-i2c-%{name}
 Summary:       Kernel modules for various buses and monitor chips
 Summary(pl):   Modu³y j±dra dla ró¿nego rodzaju sensorów
 Group:         Applications/System
 Release:       %{_rel}@%{_kernel_ver_str}
 Requires(post,postun): /sbin/depmod
 %{!?_without_dist_kernel:%requires_releq_kernel_smp}
-%{!?_without_dist_kernel:Requires:     i2c >= 2.7.0}
+%{!?_without_dist_kernel:Requires:     i2c >= 2.8.0}
 Provides:      %{name}-modules = %{version}
 Obsoletes:     %{name}-modules
+Obsoletes:     kernel-smp-misc-lm_sensors
 
-%description -n kernel-smp-misc-%{name}
+%description -n kernel-smp-i2c-%{name}
 Kernel SMP modules for various buses and monitor chips.
 
-%description -n kernel-smp-misc-%{name} -l pl
+%description -n kernel-smp-i2c-%{name} -l pl
 Modu³y j±dra SMP dla ró¿nego rodzaju sensorów monitoruj±cych.
 
 %prep
@@ -165,10 +167,8 @@ Modu
 %patch1 -p1
 
 %build
-
 %if %{?_without_smp:0}%{!?_without_smp:1}
-
-#smp
+# SMP
 %{__make} \
        CC="%{kgcc}" \
        OPTS="%{rpmcflags} -D__KERNEL_SMP=1" \
@@ -177,15 +177,6 @@ Modu
        I2C_HEADERS=%{_kernelsrcdir}/include \
        SMP=1
 
-
-%{__make} install-kernel \
-       MODDIR=kernel-smp-modules \
-       CC="%{kgcc}" \
-       OPTS="%{rpmcflags}" \
-       LINUX=/dev/null \
-       LINUX_HEADERS=%{_kernelsrcdir}/include \
-       I2C_HEADERS=%{_kernelsrcdir}/include \
-       SMP=1
 %{__make} install-kernel-busses \
        MODPREF=kernel-smp-modules
        CC="%{kgcc}" \
@@ -204,10 +195,9 @@ Modu
        SMP=1
 
 %{__make} clean
-
 %endif
 
-#up
+# UP
 %{__make} \
        CC="%{kgcc}" \
        OPTS="%{rpmcflags}" \
@@ -218,13 +208,13 @@ Modu
        SMP=0
 
 cd prog/eepromer
-%{__make}
-
+%{__make} \
+       CFLAGS="%{rpmcflags} -I../../kernel/include"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
-       $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},/lib/modules/%{_kernel_ver}smp/misc}
+       $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -232,7 +222,6 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
        ETCDIR=%{_sysconfdir} \
        MANDIR=%{_mandir} \
        PROG_EXTRA:="sensord dump" \
-       MODDIR=/lib/modules/%{_kernel_ver}/misc \
        MODPREF=/lib/modules/%{_kernel_ver}
        CC="%{kgcc}" \
        OPTS="%{rpmcflags} -D__KERNEL_SMP=1" \
@@ -249,7 +238,11 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/sensors
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/sensors
 
 %if %{?_without_smp:0}%{!?_without_smp:1}
-install kernel-smp-modules/misc/* $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/{busses,chips}
+install kernel-smp-modules/kernel/drivers/i2c/busses/*.o \
+       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/busses
+install kernel-smp-modules/kernel/drivers/i2c/chips/*.o \
+       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/chips
 %endif
 
 %clean
@@ -276,16 +269,16 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del sensors
 fi
 
-%post  -n kernel-misc-%{name}
+%post  -n kernel-i2c-%{name}
 %depmod %{_kernel_ver}
 
-%postun -n kernel-misc-%{name}
+%postun -n kernel-i2c-%{name}
 %depmod %{_kernel_ver}
 
-%post  -n kernel-smp-misc-%{name}
+%post  -n kernel-smp-i2c-%{name}
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-misc-%{name}
+%postun -n kernel-smp-i2c-%{name}
 %depmod %{_kernel_ver}smp
 
 %files
@@ -325,12 +318,18 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libsensors.a
 
-%files -n kernel-misc-%{name}
+%files -n kernel-i2c-%{name}
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/*
+%dir /lib/modules/%{_kernel_ver}/kernel/drivers/i2c/busses
+/lib/modules/%{_kernel_ver}/kernel/drivers/i2c/busses/*.o*
+%dir /lib/modules/%{_kernel_ver}/kernel/drivers/i2c/chips
+/lib/modules/%{_kernel_ver}/kernel/drivers/i2c/chips/*.o*
 
 %if %{?_without_smp:0}%{!?_without_smp:1}
-%files -n kernel-smp-misc-%{name}
+%files -n kernel-smp-i2c-%{name}
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*
+%dir /lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/busses
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/busses/*.o*
+%dir /lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/chips
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/i2c/chips/*.o*
 %endif

diff --git a/sensors.init b/sensors.init
index be3f415a6526fa59996cc01c5270ba4ed8fbd7c6..80f36dab1c790eccc36b3a852bd13cfc9e4e0866 100644 (file)
--- a/sensors.init
+++ b/sensors.init
@@ -22,9 +22,8 @@ case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/sensors ]; then
-               msg_starting "sensors daemon"
                if [ -z "$BUS" ] || [ -z "$CHIP" ]; then 
-                       fail
+                       msg_starting "sensors daemon"; fail
                        nls "BUS or CHIP not configured in /etc/sysconfig/sensors" >&2
                        exit 6
                fi
@@ -41,6 +40,7 @@ case "$1" in
                        sensors -s
                fi
 
+               msg_starting "sensors daemon"
                daemon sensord \
                        $([ -n "$INTERVAL" ] && echo "-i $INTERVAL") \
                        $([ -n "$LOG_INTERVAL" ] && echo "-l $LOG_INTERVAL") \