- rel 5; fix my sparc breakage (only 2.4 modules are build from this spec)

[packages/lm_sensors.git] / lm_sensors-make.patch

diff --git a/lm_sensors-make.patch b/lm_sensors-make.patch
index c9f5c09850bb6f565771c0c1655acc0b987b81a6..a8e3d55f7700aa04988641ca29a0323d7c7a3bc5 100644 (file)
--- a/lm_sensors-make.patch
+++ b/lm_sensors-make.patch
@@ -1,14 +1,3 @@
---- 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
- 
 --- 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 @@
@@ -40,21 +29,8 @@
        $(CC) -M -MG $(MODCPPFLAGS) $(MODCFLAGS) $< | \
                $(SED) -e 's@^\(.*\)\.o:@$*.d $*.o: Makefile '`dirname $*.d`/Module.mk' @' > $@
  
-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
+--- lm_sensors-2.8.5.orig/prog/rrd/Makefile    2002-01-05 16:39:17.000000000 +0100
++++ lm_sensors-2.8.5/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" $< > $@
  
@@ -64,7 +40,7 @@ diff -Nur lm_sensors-2.8.0.orig/prog/rrd/Makefile lm_sensors-2.8.0/prog/rrd/Make
  
  $(RRDB) : $(RRDDIR)
        ./sens_create_rrd $(RRDB)
-@@ -38,13 +38,13 @@
+@@ -38,7 +38,7 @@
        $(error error - Web server directory $(APACHE) not present - check APACHE definition in Makefile)
  
  $(APACHDIR)/pix : $(APACHE)
@@ -72,14 +48,4 @@ diff -Nur lm_sensors-2.8.0.orig/prog/rrd/Makefile lm_sensors-2.8.0/prog/rrd/Make
 +      install -d -m 777 $(APACHDIR)/pix
  
  install: all $(RRDB) $(SENSDIR) $(CRONTAB) $(APACHDIR)/pix
--      install -o root -g root -m 755 sens_update_rrd $(BINPATH)
--      install -o root -g root -m 755 sens_week.cgi $(APACHDIR)
--      install -o root -g root -m 755 sens_day.cgi $(APACHDIR)
--      install -o root -g root -m 755 summ_week.cgi $(APACHDIR)
-+      install -m 755 sens_update_rrd $(BINPATH)
-+      install -m 755 sens_week.cgi $(APACHDIR)
-+      install -m 755 sens_day.cgi $(APACHDIR)
-+      install -m 755 summ_week.cgi $(APACHDIR)
- #     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):
+       install -m 755 sens_update_rrd $(BINPATH)