]> git.pld-linux.org Git - packages/lm_sensors.git/blame - lm_sensors-make.patch
projects / packages / lm_sensors.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- updated for 2.8.2
[packages/lm_sensors.git] / lm_sensors-make.patch
CommitLineData
6f93b642
JB		 1diff -Nur lm_sensors-2.8.0.orig/etc/Module.mk lm_sensors-2.8.0/etc/Module.mk
2--- lm_sensors-2.8.0.orig/etc/Module.mk 2003-06-28 22:04:51.000000000 +0200
3+++ lm_sensors-2.8.0/etc/Module.mk 2003-07-25 23:13:42.000000000 +0200
f8d8907f 4@@ -29,7 +29,7 @@
beb2cb42
JR		 5 install-etc:
6 $(MKDIR) $(DESTDIR)$(ETCDIR)
f8d8907f 7 if [ ! -e $(DESTDIR)$(ETCINSTALL) ] ; then \
beb2cb42 8- $(INSTALL) -o root -g root -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL); \
daea7adb 9+ $(INSTALL) -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL); \
beb2cb42 10 fi
6f93b642 11 user_install :: install-etc
beb2cb42 12
6f93b642
JB		 13diff -Nur lm_sensors-2.8.0.orig/kernel/busses/Module.mk lm_sensors-2.8.0/kernel/busses/Module.mk
14--- lm_sensors-2.8.0.orig/kernel/busses/Module.mk 2003-06-14 21:25:19.000000000 +0200
15+++ lm_sensors-2.8.0/kernel/busses/Module.mk 2003-07-25 23:14:06.000000000 +0200
16@@ -105,7 +105,7 @@
17 install-kernel-busses: all-kernel-busses
beb2cb42 18 if [ -n "$(KERNELBUSSESTARGETS)" ] ; then \
6f93b642
JB		 19 $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
20- $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
21+ $(INSTALL) -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
22 for i in $(KERNELBUSSESTARGETS) ; do \
23 $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/`basename $$i` \
24 $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/`basename $$i`.gz $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses/`basename $$i`.gz ; \
3105c847
JB		 25--- lm_sensors-2.8.2/kernel/chips/Module.mk.orig 2003-10-29 06:37:52.000000000 +0100
26+++ lm_sensors-2.8.2/kernel/chips/Module.mk 2003-12-13 23:17:11.114104264 +0100
27@@ -159,7 +159,7 @@
6f93b642 28 install-kernel-chips: all-kernel-chips
beb2cb42 29 if [ -n "$(KERNELCHIPSTARGETS)" ] ; then \
6f93b642
JB		 30 $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
31- $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
32+ $(INSTALL) -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
33 for i in $(KERNELCHIPSTARGETS) ; do \
34 $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/kernel/drivers/sensors/`basename $$i` \
35 $(DESTDIR)$(MODPREF)/kernel/drivers/sensors/`basename $$i`.gz $(DESTDIR)$(MODPREF)/kernel/drivers/chips/`basename $$i`.gz ; \
3105c847
JB		 36--- lm_sensors-2.8.2/kernel/include/Module.mk.orig 2003-11-22 03:32:30.000000000 +0100
37+++ lm_sensors-2.8.2/kernel/include/Module.mk 2003-12-13 23:17:11.115104112 +0100
38@@ -39,7 +39,7 @@
beb2cb42
JR		 39 install-all-kernel-include:
40 if [ -n "$(KERNELINCLUDEFILES)" ] ; then \
41 $(MKDIR) $(DESTDIR)$(SYSINCLUDEDIR) ; \
42- $(INSTALL) -o root -g root -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) ; \
daea7adb 43+ $(INSTALL) -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) ; \
beb2cb42
JR		 44 fi
45
6f93b642 46 user_install :: install-all-kernel-include
6f93b642
JB		 47--- lm_sensors-2.8.0.orig/kernel/Module.mk 2003-05-31 17:48:28.000000000 +0200
48+++ lm_sensors-2.8.0/kernel/Module.mk 2003-07-25 23:13:59.000000000 +0200
49@@ -39,7 +39,7 @@
50 install-kernel: all-kernel
51 # if [ -n "$(KERNELTARGETS)" ] ; then \
52 # $(MKDIR) $(DESTDIR)$(MODDIR) ; \
53-# $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\
54+# $(INSTALL) -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\
55 # fi
56 $(RM) $(DESTDIR)$(MODPREF)/misc/sensors.o
57
58diff -Nur lm_sensors-2.8.0.orig/lib/Module.mk lm_sensors-2.8.0/lib/Module.mk
59--- lm_sensors-2.8.0.orig/lib/Module.mk 2003-07-08 14:47:41.000000000 +0200
60+++ lm_sensors-2.8.0/lib/Module.mk 2003-07-25 23:16:02.000000000 +0200
61@@ -106,7 +106,7 @@
62 echo ' Run the following command: /sbin/ldconfig' ; \
63 echo '******************************************************************************' ; \
64 fi
beb2cb42 65- $(INSTALL) -o root -g root -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR)
daea7adb 66+ $(INSTALL) -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR)
beb2cb42
JR		 67 $(LN) $(LIBSHLIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBSHSONAME)
68 $(LN) $(LIBSHSONAME) $(DESTDIR)$(LIBDIR)/$(LIBSHBASENAME)
6f93b642
JB		 69 @if [ "$(DESTDIR)$(LIBDIR)" != "/usr/lib" -a "$(DESTDIR)$(LIBDIR)" != "/lib" ] ; then \
70@@ -128,9 +128,9 @@
71 echo ' Add it and run /sbin/ldconfig for the userspace tools to work.' ; \
72 echo '******************************************************************************' ) ; \
73 fi
beb2cb42
JR		 74- $(INSTALL) -o root -g root -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR)
75- $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR)
76- $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR)
daea7adb
JB		 77+ $(INSTALL) -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR)
78+ $(INSTALL) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR)
79+ $(INSTALL) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR)
beb2cb42 80
beb2cb42 81
6f93b642 82 user_install :: install-lib
3105c847
JB		 83--- lm_sensors-2.8.2/Makefile.orig 2003-11-29 20:59:31.000000000 +0100
84+++ lm_sensors-2.8.2/Makefile 2003-12-13 23:24:48.024643304 +0100
85@@ -183,13 +183,11 @@
6f93b642
JB		 86 # ARCPPFLAGS/ARCFLAGS are used to create archive object files (static libraries).
87 # LIBCPPFLAGS/LIBCFLAGS are for shared library objects.
55005178 88 ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS)
3105c847 89-ALL_CFLAGS := -Wall
6f93b642
JB		 90+OPTS = -O2
91+ALL_CFLAGS := -Wall $(OPTS)
92
93 ifeq ($(DEBUG),1)
94 ALL_CPPFLAGS += -DDEBUG
3105c847
JB		 95-ALL_CFLAGS += -O -g
96-else
97-ALL_CFLAGS += -O2
98 endif
99
100 ifeq ($(WARN),1)
101@@ -328,10 +326,10 @@
102
103 # .o files are used for modules
104 # depend on the kernel config file!
105-%.o: %.c $(LINUX)/.config
106+%.o: %.c
107 $(CC) $(MODCPPFLAGS) $(MODCFLAGS) -c $< -o $@
108
109-%.d: %.c $(LINUX)/.config
110+%.d: %.c
111 $(CC) -M -MG $(MODCPPFLAGS) $(MODCFLAGS) $< | \
112 $(SED) -e 's@^\(.*\)\.o:@$*.d $*.o: Makefile '`dirname $*.d`/Module.mk' @' > $@
113
114--- lm_sensors-2.8.2/prog/detect/Module.mk.orig 2003-11-29 20:38:10.000000000 +0100
115+++ lm_sensors-2.8.2/prog/detect/Module.mk 2003-12-13 23:25:53.868633496 +0100
116@@ -40,7 +40,7 @@
beb2cb42
JR		 117
118 install-prog-detect: all-prog-detect
119 mkdir -p $(DESTDIR)$(SBINDIR)
120- $(INSTALL) -o root -g root -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR)
daea7adb 121+ $(INSTALL) -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR)
6f93b642 122 user_install :: install-prog-detect
beb2cb42 123
3105c847
JB		 124 clean-prog-detect:
125--- lm_sensors-2.8.2/prog/dump/Module.mk.orig 2003-11-21 05:05:48.000000000 +0100
126+++ lm_sensors-2.8.2/prog/dump/Module.mk 2003-12-13 23:17:11.126102440 +0100
127@@ -45,7 +45,7 @@
3c47d66f 128
129 install-prog-dump: all-prog-dump
130 mkdir -p $(DESTDIR)$(SBINDIR)
131- $(INSTALL) -o root -g root -m 755 $(PROGDUMPBININSTALL) $(DESTDIR)$(SBINDIR)
132+ $(INSTALL) -m 755 $(PROGDUMPBININSTALL) $(DESTDIR)$(SBINDIR)
6f93b642 133 user_install :: install-prog-dump
3c47d66f 134
135 clean-prog-dump:
6f93b642
JB		 136diff -Nur lm_sensors-2.8.0.orig/prog/hotplug/Makefile lm_sensors-2.8.0/prog/hotplug/Makefile
137--- lm_sensors-2.8.0.orig/prog/hotplug/Makefile 2003-05-31 19:30:47.000000000 +0200
138+++ lm_sensors-2.8.0/prog/hotplug/Makefile 2003-07-25 23:17:07.000000000 +0200
139@@ -18,7 +18,7 @@
140 $(CC) $(CFLAGS) -c $< -o $@
141
142 install: all
143- install -o root -g root -m 644 $(OBJS) /lib/modules/$(VER)/kernel/drivers/i2c/busses
144+ install -m 644 $(OBJS) /lib/modules/$(VER)/kernel/drivers/i2c/busses
145
146 clean:
147 rm -f $(OBJS)
148diff -Nur lm_sensors-2.8.0.orig/prog/rrd/Makefile lm_sensors-2.8.0/prog/rrd/Makefile
149--- lm_sensors-2.8.0.orig/prog/rrd/Makefile 2002-01-05 16:39:17.000000000 +0100
150+++ lm_sensors-2.8.0/prog/rrd/Makefile 2003-07-25 23:17:50.000000000 +0200
151@@ -22,7 +22,7 @@
152 sed -e "s#%%RRDPATH%%#$(RRDPATH)#g;s#%%APACHDIR%%#$(APACHDIR)#g;s#%%RRDDIR%%#$(RRDDIR)#g;s#%%MACH%%#$(MACH)#g" $< > $@
153
154 $(RRDDIR) :
155- install -d -o $(USER) $(RRDDIR)
156+ install -d $(RRDDIR)
157
158 $(RRDB) : $(RRDDIR)
159 ./sens_create_rrd $(RRDB)
160@@ -38,13 +38,13 @@
161 $(error error - Web server directory $(APACHE) not present - check APACHE definition in Makefile)
162
163 $(APACHDIR)/pix : $(APACHE)
164- install -d -o $(USER) -m 777 $(APACHDIR)/pix
165+ install -d -m 777 $(APACHDIR)/pix
3833b7e8 166
167 install: all $(RRDB) $(SENSDIR) $(CRONTAB) $(APACHDIR)/pix
168- install -o root -g root -m 755 sens_update_rrd $(BINPATH)
169- install -o root -g root -m 755 sens_week.cgi $(APACHDIR)
170- install -o root -g root -m 755 sens_day.cgi $(APACHDIR)
171- install -o root -g root -m 755 summ_week.cgi $(APACHDIR)
172+ install -m 755 sens_update_rrd $(BINPATH)
173+ install -m 755 sens_week.cgi $(APACHDIR)
174+ install -m 755 sens_day.cgi $(APACHDIR)
175+ install -m 755 summ_week.cgi $(APACHDIR)
176 # grep sens_update_rrd $(CRONTAB) > /dev/null 2>&1 || echo '*/5 * * * * /usr/local/bin/sens_update_rrd' $(RRDB) $(SENSDEV) >> $(CRONTAB)
177 @echo
178 @echo Note!!! You must manually install the following line in the crontab for user $(USER):
6f93b642
JB		 179diff -Nur lm_sensors-2.8.0.orig/prog/sensord/Module.mk lm_sensors-2.8.0/prog/sensord/Module.mk
180--- lm_sensors-2.8.0.orig/prog/sensord/Module.mk 2003-06-28 22:04:50.000000000 +0200
181+++ lm_sensors-2.8.0/prog/sensord/Module.mk 2003-07-25 23:18:02.000000000 +0200
f8d8907f 182@@ -45,8 +45,8 @@
beb2cb42
JR		 183
184 install-prog-sensord: all-prog-sensord
185 $(MKDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(PROGSENSORDMAN1DIR)
186- $(INSTALL) -o root -g root -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR)
187- $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR)
daea7adb
JB		 188+ $(INSTALL) -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR)
189+ $(INSTALL) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR)
6f93b642 190 user_install :: install-prog-sensord
beb2cb42
JR		 191
192 clean-prog-sensord:
6f93b642
JB		 193diff -Nur lm_sensors-2.8.0.orig/prog/sensors/Module.mk lm_sensors-2.8.0/prog/sensors/Module.mk
194--- lm_sensors-2.8.0.orig/prog/sensors/Module.mk 2003-06-28 22:04:50.000000000 +0200
195+++ lm_sensors-2.8.0/prog/sensors/Module.mk 2003-07-25 23:18:14.000000000 +0200
beb2cb42
JR		 196@@ -41,8 +41,8 @@
197
198 install-prog-sensors: all-prog-sensors
199 mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(PROGSENSORSMAN1DIR)
200- $(INSTALL) -o root -g root -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR)
201- $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR)
daea7adb
JB		 202+ $(INSTALL) -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR)
203+ $(INSTALL) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR)
6f93b642 204 user_install :: install-prog-sensors
beb2cb42
JR		 205
206 clean-prog-sensors:
3105c847
JB		 207--- lm_sensors-2.8.2/prog/eeprom/Module.mk.orig 2003-11-29 14:29:59.000000000 +0100
208+++ lm_sensors-2.8.2/prog/eeprom/Module.mk 2003-12-13 23:47:55.054782672 +0100
209@@ -23,7 +23,8 @@
210 $(MODULE_DIR)/decode-vaio.pl
211
212 install-prog-eeprom: $(PROGEEPROMTARGETS)
213- $(INSTALL) -o root -g root -m 755 $(PROGEEPROMTARGETS) $(BINDIR)
214+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
215+ $(INSTALL) -m 755 $(PROGEEPROMTARGETS) $(DESTDIR)$(BINDIR)
216
217 user_install :: install-prog-eeprom
218
219--- lm_sensors-2.8.2/prog/pwm/Module.mk.orig 2003-10-28 02:41:47.000000000 +0100
220+++ lm_sensors-2.8.2/prog/pwm/Module.mk 2003-12-13 23:53:10.365848104 +0100
221@@ -22,7 +22,8 @@
222 $(MODULE_DIR)/pwmconfig
223
224 install-prog-pwm: $(PROGPWMTARGETS)
225- $(INSTALL) -o root -g root -m 755 $(PROGPWMTARGETS) $(SBINDIR)
226+ $(INSTALL) -d $(DESTDIR)$(SBINDIR)
227+ $(INSTALL) -m 755 $(PROGPWMTARGETS) $(DESTDIR)$(SBINDIR)
228
229 user_install :: install-prog-pwm
230
231--- lm_sensors-2.8.2/prog/xeon/Module.mk.orig 2003-11-29 14:29:59.000000000 +0100
232+++ lm_sensors-2.8.2/prog/xeon/Module.mk 2003-12-13 23:55:56.765551504 +0100
233@@ -21,7 +21,8 @@
234 PROGXEONTARGETS := $(MODULE_DIR)/decode-xeon.pl
235
236 install-prog-xeon: $(PROGXEONTARGETS)
237- $(INSTALL) -o root -g root -m 755 $(PROGXEONTARGETS) $(BINDIR)
238+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
239+ $(INSTALL) -m 755 $(PROGXEONTARGETS) $(DESTDIR)$(BINDIR)
240
241 user_install :: install-prog-xeon
242
Hardware health monitoring
This page took 0.070151 seconds and 4 git commands to generate.