- updated for 2.6.4

Changed files:
    lm_sensors-make.patch -> 1.2

diff --git a/lm_sensors-make.patch b/lm_sensors-make.patch
index cd6cbe28cc478885a2b7496dc2e2ce9b36ce9ab2..8f03b73a93eca47b95906fa45d511bffa86535ad 100644 (file)
--- a/lm_sensors-make.patch
+++ b/lm_sensors-make.patch
@@ -1,136 +1,138 @@
-diff -urN lm_sensors-2.5.2.orig/Makefile lm_sensors-2.5.2/Makefile
---- lm_sensors-2.5.2.orig/Makefile     Sun Jul  9 22:37:13 2000
-+++ lm_sensors-2.5.2/Makefile  Fri Sep 15 23:16:35 2000
-@@ -157,7 +157,8 @@
- # create non-kernel object files (which are linked into executables).
- # ARCFLAGS are used to create archive object files (static libraries), and
- # LIBCFLAGS are for shared library objects.
--CFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS) -O2 
-+OPTS=-O2
-+CFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS) $(OPTS)
- 
- ifeq ($(DEBUG),1)
- CFLAGS += -DDEBUG
-diff -urN lm_sensors-2.5.2.orig/etc/Module.mk lm_sensors-2.5.2/etc/Module.mk
---- lm_sensors-2.5.2.orig/etc/Module.mk        Fri Dec 24 20:52:27 1999
-+++ lm_sensors-2.5.2/etc/Module.mk     Fri Sep 15 23:12:05 2000
-@@ -28,9 +28,8 @@
- 
+--- ./etc/Module.mk.org        Fri Dec 24 20:52:27 1999
++++ ./etc/Module.mk    Tue Jul 23 16:55:28 2002
+@@ -29,7 +29,7 @@
  install-etc:
        $(MKDIR) $(DESTDIR)$(ETCDIR)
--      if [ ! -e $(DESTDIR)$(ETCINSTALL) ] ; then \
+       if [ ! -e $(DESTDIR)$(ETCINSTALL) ] ; then \
 -        $(INSTALL) -o  root -g root -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL); \
--      fi
-+      $(INSTALL) -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL)
-+
- install :: install-etc
- 
- # No clean rule
-diff -urN lm_sensors-2.5.2.orig/kernel/Module.mk lm_sensors-2.5.2/kernel/Module.mk
---- lm_sensors-2.5.2.orig/kernel/Module.mk     Mon Jan  3 01:32:38 2000
-+++ lm_sensors-2.5.2/kernel/Module.mk  Fri Sep 15 23:12:28 2000
-@@ -37,7 +37,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) ;\
++        $(INSTALL) -o  root -g root -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL) || true; \
        fi
- install :: install-kernel 
+ install :: install-etc
  
-diff -urN lm_sensors-2.5.2.orig/kernel/busses/Module.mk lm_sensors-2.5.2/kernel/busses/Module.mk
---- lm_sensors-2.5.2.orig/kernel/busses/Module.mk      Tue May 23 03:33:13 2000
-+++ lm_sensors-2.5.2/kernel/busses/Module.mk   Fri Sep 15 23:12:56 2000
-@@ -54,7 +54,7 @@
- install-kernel-busses: all-kernel-busses
+--- ./kernel/busses/Module.mk.org      Sat Jul  6 02:49:13 2002
++++ ./kernel/busses/Module.mk  Tue Jul 23 16:22:15 2002
+@@ -89,13 +89,13 @@
        if [ -n "$(KERNELBUSSESTARGETS)" ] ; then \
-         $(MKDIR) $(DESTDIR)$(MODDIR) ; \
--        $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODDIR) ; \
-+        $(INSTALL) -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 ; \
++          $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c || true; \
+           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) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/misc || true; \
+         fi \
        fi
  
- install :: install-kernel-busses
-diff -urN lm_sensors-2.5.2.orig/kernel/chips/Module.mk lm_sensors-2.5.2/kernel/chips/Module.mk
---- lm_sensors-2.5.2.orig/kernel/chips/Module.mk       Thu May 11 03:35:22 2000
-+++ lm_sensors-2.5.2/kernel/chips/Module.mk    Fri Sep 15 23:12:47 2000
-@@ -69,7 +69,7 @@
- install-kernel-chips: all-kernel-chips
+--- ./kernel/chips/Module.mk.org       Sat Jul  6 02:49:13 2002
++++ ./kernel/chips/Module.mk   Tue Jul 23 16:22:58 2002
+@@ -136,13 +136,13 @@
        if [ -n "$(KERNELCHIPSTARGETS)" ] ; then \
-         $(MKDIR) $(DESTDIR)$(MODDIR) ; \
--        $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODDIR) ;\
-+        $(INSTALL) -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 ; \
++          $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/sensors || true; \
+           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) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/misc || true; \
+         fi \
        fi
  
- install :: install-kernel-chips
-diff -urN lm_sensors-2.5.2.orig/kernel/include/Module.mk lm_sensors-2.5.2/kernel/include/Module.mk
---- lm_sensors-2.5.2.orig/kernel/include/Module.mk     Mon Jan  3 01:32:38 2000
-+++ lm_sensors-2.5.2/kernel/include/Module.mk  Fri Sep 15 23:12:37 2000
-@@ -32,7 +32,7 @@
+--- ./kernel/include/Module.mk.org     Tue Feb  6 03:53:46 2001
++++ ./kernel/include/Module.mk Tue Jul 23 16:24:16 2002
+@@ -33,7 +33,7 @@
  install-all-kernel-include:
        if [ -n "$(KERNELINCLUDEFILES)" ] ; then \
          $(MKDIR) $(DESTDIR)$(SYSINCLUDEDIR) ; \
 -        $(INSTALL) -o root -g root -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) ; \
-+        $(INSTALL) -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) ; \
++        $(INSTALL) -o root -g root -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) || true; \
        fi
  
  install :: install-all-kernel-include
-diff -urN lm_sensors-2.5.2.orig/lib/Module.mk lm_sensors-2.5.2/lib/Module.mk
---- lm_sensors-2.5.2.orig/lib/Module.mk        Mon Jul 10 01:46:23 2000
-+++ lm_sensors-2.5.2/lib/Module.mk     Fri Sep 15 23:13:25 2000
+--- ./kernel/Module.mk.org     Tue Feb  6 03:53:46 2001
++++ ./kernel/Module.mk Tue Jul 23 16:21:08 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) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) || true ;\
+       fi
+       $(RM) $(DESTDIR)$(MODDIR)/sensors.o
+ 
+--- ./lib/Module.mk.org        Sat Mar 23 01:53:08 2002
++++ ./lib/Module.mk    Tue Jul 23 16:46:24 2002
 @@ -87,12 +87,12 @@
  
  install-lib: all-lib
        $(MKDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(LIBINCLUDEDIR) $(DESTDIR)$(LIBMAN3DIR) $(DESTDIR)$(LIBMAN5DIR)
 -      $(INSTALL) -o root -g root -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR)
-+      $(INSTALL) -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR)
++      $(INSTALL) -o root -g root -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR) || true
        $(LN) $(LIBSHLIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBSHSONAME)
        $(LN) $(LIBSHSONAME) $(DESTDIR)$(LIBDIR)/$(LIBSHBASENAME)
 -      $(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)
-+      $(INSTALL) -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR)
-+      $(INSTALL) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR)
-+      $(INSTALL) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR)
++      $(INSTALL) -o root -g root -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR) ||true
++      $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR) || true
++      $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR) || true
  
  install :: install-lib
  
-diff -urN lm_sensors-2.5.2.orig/prog/detect/Module.mk lm_sensors-2.5.2/prog/detect/Module.mk
---- lm_sensors-2.5.2.orig/prog/detect/Module.mk        Fri Dec 24 20:52:27 1999
-+++ lm_sensors-2.5.2/prog/detect/Module.mk     Fri Sep 15 23:13:42 2000
+--- ./prog/detect/Module.mk.org        Fri Dec 24 20:52:27 1999
++++ ./prog/detect/Module.mk    Tue Jul 23 16:49:07 2002
 @@ -36,7 +36,7 @@
  
  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) -o root -g root -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR) || true
  install :: install-prog-detect
  
  clean-prog-detect:
-diff -urN lm_sensors-2.5.2.orig/prog/sensord/Module.mk lm_sensors-2.5.2/prog/sensord/Module.mk
---- lm_sensors-2.5.2.orig/prog/sensord/Module.mk       Mon Jul  3 00:49:34 2000
-+++ lm_sensors-2.5.2/prog/sensord/Module.mk    Fri Sep 15 23:14:07 2000
-@@ -41,8 +41,8 @@
+--- ./prog/sensord/Module.mk.org       Sun Apr 28 16:26:07 2002
++++ ./prog/sensord/Module.mk   Tue Jul 23 16:49:49 2002
+@@ -45,8 +45,8 @@
  
  install-prog-sensord: all-prog-sensord
        $(MKDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(PROGSENSORDMAN1DIR)
 -      $(INSTALL) -o root -g root -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR)
 -      $(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
++      $(INSTALL) -o root -g root -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR) || true
++      $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR) || true
+ install :: install-prog-sensord
  
  clean-prog-sensord:
-diff -urN lm_sensors-2.5.2.orig/prog/sensors/Module.mk lm_sensors-2.5.2/prog/sensors/Module.mk
---- lm_sensors-2.5.2.orig/prog/sensors/Module.mk       Fri Dec 24 20:52:28 1999
-+++ lm_sensors-2.5.2/prog/sensors/Module.mk    Fri Sep 15 23:14:17 2000
+--- ./prog/sensors/Module.mk.org       Fri Dec 24 20:52:28 1999
++++ ./prog/sensors/Module.mk   Tue Jul 23 16:50:43 2002
 @@ -41,8 +41,8 @@
  
  install-prog-sensors: all-prog-sensors
        mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(PROGSENSORSMAN1DIR)
 -      $(INSTALL) -o root -g root -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR)
 -      $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR)
-+      $(INSTALL) -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR)
-+      $(INSTALL) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR)
++      $(INSTALL) -o root -g root -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR) || true
++      $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR) || true
  install :: install-prog-sensors
  
  clean-prog-sensors:
+--- ./Makefile.org     Mon Apr 29 03:37:07 2002
++++ ./Makefile Tue Jul 23 16:19:17 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