- updated for 2.8.2

Changed files:
    lm_sensors-make.patch -> 1.9

diff --git a/lm_sensors-make.patch b/lm_sensors-make.patch
index 6e4ea084a6ae8b20fd93c779372237c7d68c19b5..d3d788a255169284962fc75518ea8c1c73a40d3f 100644 (file)
--- a/lm_sensors-make.patch
+++ b/lm_sensors-make.patch
@@ -22,10 +22,9 @@ diff -Nur lm_sensors-2.8.0.orig/kernel/busses/Module.mk lm_sensors-2.8.0/kernel/
          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 @@
+--- lm_sensors-2.8.2/kernel/chips/Module.mk.orig       2003-10-29 06:37:52.000000000 +0100
++++ lm_sensors-2.8.2/kernel/chips/Module.mk    2003-12-13 23:17:11.114104264 +0100
+@@ -159,7 +159,7 @@
  install-kernel-chips: all-kernel-chips
        if [ -n "$(KERNELCHIPSTARGETS)" ] ; then \
          $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
@@ -34,10 +33,9 @@ diff -Nur lm_sensors-2.8.0.orig/kernel/chips/Module.mk lm_sensors-2.8.0/kernel/c
          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 @@
+--- lm_sensors-2.8.2/kernel/include/Module.mk.orig     2003-11-22 03:32:30.000000000 +0100
++++ lm_sensors-2.8.2/kernel/include/Module.mk  2003-12-13 23:17:11.115104112 +0100
+@@ -39,7 +39,7 @@
  install-all-kernel-include:
        if [ -n "$(KERNELINCLUDEFILES)" ] ; then \
          $(MKDIR) $(DESTDIR)$(SYSINCLUDEDIR) ; \
@@ -46,7 +44,6 @@ diff -Nur lm_sensors-2.8.0.orig/kernel/include/Module.mk lm_sensors-2.8.0/kernel
        fi
  
  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 @@
@@ -83,38 +80,51 @@ diff -Nur lm_sensors-2.8.0.orig/lib/Module.mk lm_sensors-2.8.0/lib/Module.mk
  
  
  user_install :: install-lib
-diff -Nur lm_sensors-2.8.1.orig/Makefile lm_sensors-2.8.1/Makefile
---- lm_sensors-2.8.1.orig/Makefile     2003-07-08 11:06:50.000000000 +0200
-+++ lm_sensors-2.8.1/Makefile  2003-07-25 23:13:29.000000000 +0200
-@@ -186,7 +186,8 @@
+--- lm_sensors-2.8.2/Makefile.orig     2003-11-29 20:59:31.000000000 +0100
++++ lm_sensors-2.8.2/Makefile  2003-12-13 23:24:48.024643304 +0100
+@@ -183,13 +183,11 @@
  # 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)
--ALL_CFLAGS := -Wall -O2 
+-ALL_CFLAGS := -Wall
 +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 @@
+-ALL_CFLAGS += -O -g
+-else
+-ALL_CFLAGS += -O2
+ endif
+ 
+ ifeq ($(WARN),1)
+@@ -328,10 +326,10 @@
+ 
+ # .o files are used for modules
+ # depend on the kernel config file!
+-%.o: %.c $(LINUX)/.config
++%.o: %.c
+       $(CC) $(MODCPPFLAGS) $(MODCFLAGS) -c $< -o $@
+ 
+-%.d: %.c $(LINUX)/.config
++%.d: %.c
+       $(CC) -M -MG $(MODCPPFLAGS) $(MODCFLAGS) $< | \
+               $(SED) -e 's@^\(.*\)\.o:@$*.d $*.o: Makefile '`dirname $*.d`/Module.mk' @' > $@
+ 
+--- lm_sensors-2.8.2/prog/detect/Module.mk.orig        2003-11-29 20:38:10.000000000 +0100
++++ lm_sensors-2.8.2/prog/detect/Module.mk     2003-12-13 23:25:53.868633496 +0100
+@@ -40,7 +40,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)
-       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
  
-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 @@
+ clean-prog-detect:
+--- lm_sensors-2.8.2/prog/dump/Module.mk.orig  2003-11-21 05:05:48.000000000 +0100
++++ lm_sensors-2.8.2/prog/dump/Module.mk       2003-12-13 23:17:11.126102440 +0100
+@@ -45,7 +45,7 @@
  
  install-prog-dump: all-prog-dump
        mkdir -p $(DESTDIR)$(SBINDIR)
@@ -194,3 +204,39 @@ diff -Nur lm_sensors-2.8.0.orig/prog/sensors/Module.mk lm_sensors-2.8.0/prog/sen
  user_install :: install-prog-sensors
  
  clean-prog-sensors:
+--- lm_sensors-2.8.2/prog/eeprom/Module.mk.orig        2003-11-29 14:29:59.000000000 +0100
++++ lm_sensors-2.8.2/prog/eeprom/Module.mk     2003-12-13 23:47:55.054782672 +0100
+@@ -23,7 +23,8 @@
+                      $(MODULE_DIR)/decode-vaio.pl
+ 
+ install-prog-eeprom: $(PROGEEPROMTARGETS)
+-      $(INSTALL) -o root -g root -m 755 $(PROGEEPROMTARGETS) $(BINDIR)
++      $(INSTALL) -d $(DESTDIR)$(BINDIR)
++      $(INSTALL) -m 755 $(PROGEEPROMTARGETS) $(DESTDIR)$(BINDIR)
+ 
+ user_install :: install-prog-eeprom
+ 
+--- lm_sensors-2.8.2/prog/pwm/Module.mk.orig   2003-10-28 02:41:47.000000000 +0100
++++ lm_sensors-2.8.2/prog/pwm/Module.mk        2003-12-13 23:53:10.365848104 +0100
+@@ -22,7 +22,8 @@
+                   $(MODULE_DIR)/pwmconfig
+ 
+ install-prog-pwm: $(PROGPWMTARGETS)
+-      $(INSTALL) -o root -g root -m 755 $(PROGPWMTARGETS) $(SBINDIR)
++      $(INSTALL) -d $(DESTDIR)$(SBINDIR)
++      $(INSTALL) -m 755 $(PROGPWMTARGETS) $(DESTDIR)$(SBINDIR)
+ 
+ user_install :: install-prog-pwm
+ 
+--- lm_sensors-2.8.2/prog/xeon/Module.mk.orig  2003-11-29 14:29:59.000000000 +0100
++++ lm_sensors-2.8.2/prog/xeon/Module.mk       2003-12-13 23:55:56.765551504 +0100
+@@ -21,7 +21,8 @@
+ PROGXEONTARGETS := $(MODULE_DIR)/decode-xeon.pl
+ 
+ install-prog-xeon: $(PROGXEONTARGETS)
+-      $(INSTALL) -o root -g root -m 755 $(PROGXEONTARGETS) $(BINDIR)
++      $(INSTALL) -d $(DESTDIR)$(BINDIR)
++      $(INSTALL) -m 755 $(PROGXEONTARGETS) $(DESTDIR)$(BINDIR)
+ 
+ user_install :: install-prog-xeon
+