]> 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
- 2.8.0, updated make patch; BR+R i2c 2.8.0
[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 ; \
25diff -Nur lm_sensors-2.8.0.orig/kernel/chips/Module.mk lm_sensors-2.8.0/kernel/chips/Module.mk
26--- lm_sensors-2.8.0.orig/kernel/chips/Module.mk 2003-07-03 19:27:09.000000000 +0200
27+++ lm_sensors-2.8.0/kernel/chips/Module.mk 2003-07-25 23:14:11.000000000 +0200
28@@ -149,7 +149,7 @@
29 install-kernel-chips: all-kernel-chips
beb2cb42 30 if [ -n "$(KERNELCHIPSTARGETS)" ] ; then \
6f93b642
JB		 31 $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
32- $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
33+ $(INSTALL) -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
34 for i in $(KERNELCHIPSTARGETS) ; do \
35 $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/kernel/drivers/sensors/`basename $$i` \
36 $(DESTDIR)$(MODPREF)/kernel/drivers/sensors/`basename $$i`.gz $(DESTDIR)$(MODPREF)/kernel/drivers/chips/`basename $$i`.gz ; \
37diff -Nur lm_sensors-2.8.0.orig/kernel/include/Module.mk lm_sensors-2.8.0/kernel/include/Module.mk
38--- lm_sensors-2.8.0.orig/kernel/include/Module.mk 2003-06-28 23:56:08.000000000 +0200
39+++ lm_sensors-2.8.0/kernel/include/Module.mk 2003-07-25 23:14:18.000000000 +0200
40@@ -38,7 +38,7 @@
beb2cb42
JR		 41 install-all-kernel-include:
42 if [ -n "$(KERNELINCLUDEFILES)" ] ; then \
43 $(MKDIR) $(DESTDIR)$(SYSINCLUDEDIR) ; \
44- $(INSTALL) -o root -g root -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) ; \
daea7adb 45+ $(INSTALL) -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) ; \
beb2cb42
JR		 46 fi
47
6f93b642
JB		 48 user_install :: install-all-kernel-include
49diff -Nur lm_sensors-2.8.0.orig/kernel/Module.mk lm_sensors-2.8.0/kernel/Module.mk
50--- lm_sensors-2.8.0.orig/kernel/Module.mk 2003-05-31 17:48:28.000000000 +0200
51+++ lm_sensors-2.8.0/kernel/Module.mk 2003-07-25 23:13:59.000000000 +0200
52@@ -39,7 +39,7 @@
53 install-kernel: all-kernel
54 # if [ -n "$(KERNELTARGETS)" ] ; then \
55 # $(MKDIR) $(DESTDIR)$(MODDIR) ; \
56-# $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\
57+# $(INSTALL) -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\
58 # fi
59 $(RM) $(DESTDIR)$(MODPREF)/misc/sensors.o
60
61diff -Nur lm_sensors-2.8.0.orig/lib/Module.mk lm_sensors-2.8.0/lib/Module.mk
62--- lm_sensors-2.8.0.orig/lib/Module.mk 2003-07-08 14:47:41.000000000 +0200
63+++ lm_sensors-2.8.0/lib/Module.mk 2003-07-25 23:16:02.000000000 +0200
64@@ -106,7 +106,7 @@
65 echo ' Run the following command: /sbin/ldconfig' ; \
66 echo '******************************************************************************' ; \
67 fi
beb2cb42 68- $(INSTALL) -o root -g root -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR)
daea7adb 69+ $(INSTALL) -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR)
beb2cb42
JR		 70 $(LN) $(LIBSHLIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBSHSONAME)
71 $(LN) $(LIBSHSONAME) $(DESTDIR)$(LIBDIR)/$(LIBSHBASENAME)
6f93b642
JB		 72 @if [ "$(DESTDIR)$(LIBDIR)" != "/usr/lib" -a "$(DESTDIR)$(LIBDIR)" != "/lib" ] ; then \
73@@ -128,9 +128,9 @@
74 echo ' Add it and run /sbin/ldconfig for the userspace tools to work.' ; \
75 echo '******************************************************************************' ) ; \
76 fi
beb2cb42
JR		 77- $(INSTALL) -o root -g root -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR)
78- $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR)
79- $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR)
daea7adb
JB		 80+ $(INSTALL) -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR)
81+ $(INSTALL) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR)
82+ $(INSTALL) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR)
beb2cb42 83
beb2cb42 84
6f93b642
JB		 85 user_install :: install-lib
86diff -Nur lm_sensors-2.8.0.orig/Makefile lm_sensors-2.8.0/Makefile
87--- lm_sensors-2.8.0.orig/Makefile 2003-07-08 11:06:50.000000000 +0200
88+++ lm_sensors-2.8.0/Makefile 2003-07-25 23:13:29.000000000 +0200
89@@ -186,7 +186,8 @@
90 # ARCPPFLAGS/ARCFLAGS are used to create archive object files (static libraries).
91 # LIBCPPFLAGS/LIBCFLAGS are for shared library objects.
92 ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS)
93-ALL_CFLAGS := -Wall -O2
94+OPTS = -O2
95+ALL_CFLAGS := -Wall $(OPTS)
96
97 ifeq ($(DEBUG),1)
98 ALL_CPPFLAGS += -DDEBUG
99diff -Nur lm_sensors-2.8.0.orig/prog/detect/Module.mk lm_sensors-2.8.0/prog/detect/Module.mk
100--- lm_sensors-2.8.0.orig/prog/detect/Module.mk 2003-07-07 12:44:29.000000000 +0200
101+++ lm_sensors-2.8.0/prog/detect/Module.mk 2003-07-25 23:16:42.000000000 +0200
102@@ -37,9 +37,9 @@
beb2cb42
JR		 103
104 install-prog-detect: all-prog-detect
105 mkdir -p $(DESTDIR)$(SBINDIR)
106- $(INSTALL) -o root -g root -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR)
daea7adb 107+ $(INSTALL) -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR)
6f93b642
JB		 108 if [ ! -e $(DESTDIR)$(SBINDIR)/dmidecode -o $(DESTDIR)$(SBINDIR)/dmidecode -ot $(PROGDETECTDIR)/dmidecode.c ] ; then \
109- $(INSTALL) -o root -g root -m 755 $(PROGDETECTDIR)/dmidecode $(DESTDIR)$(SBINDIR) ; \
110+ $(INSTALL) -m 755 $(PROGDETECTDIR)/dmidecode $(DESTDIR)$(SBINDIR) ; \
111 fi
112 user_install :: install-prog-detect
beb2cb42 113
6f93b642
JB		 114diff -Nur lm_sensors-2.8.0.orig/prog/dump/Module.mk lm_sensors-2.8.0/prog/dump/Module.mk
115--- lm_sensors-2.8.0.orig/prog/dump/Module.mk 2003-06-28 22:04:50.000000000 +0200
116+++ lm_sensors-2.8.0/prog/dump/Module.mk 2003-07-25 23:16:50.000000000 +0200
3c47d66f 117@@ -39,7 +39,7 @@
118
119 install-prog-dump: all-prog-dump
120 mkdir -p $(DESTDIR)$(SBINDIR)
121- $(INSTALL) -o root -g root -m 755 $(PROGDUMPBININSTALL) $(DESTDIR)$(SBINDIR)
122+ $(INSTALL) -m 755 $(PROGDUMPBININSTALL) $(DESTDIR)$(SBINDIR)
6f93b642 123 user_install :: install-prog-dump
3c47d66f 124
125 clean-prog-dump:
6f93b642
JB		 126diff -Nur lm_sensors-2.8.0.orig/prog/hotplug/Makefile lm_sensors-2.8.0/prog/hotplug/Makefile
127--- lm_sensors-2.8.0.orig/prog/hotplug/Makefile 2003-05-31 19:30:47.000000000 +0200
128+++ lm_sensors-2.8.0/prog/hotplug/Makefile 2003-07-25 23:17:07.000000000 +0200
129@@ -18,7 +18,7 @@
130 $(CC) $(CFLAGS) -c $< -o $@
131
132 install: all
133- install -o root -g root -m 644 $(OBJS) /lib/modules/$(VER)/kernel/drivers/i2c/busses
134+ install -m 644 $(OBJS) /lib/modules/$(VER)/kernel/drivers/i2c/busses
135
136 clean:
137 rm -f $(OBJS)
138diff -Nur lm_sensors-2.8.0.orig/prog/rrd/Makefile lm_sensors-2.8.0/prog/rrd/Makefile
139--- lm_sensors-2.8.0.orig/prog/rrd/Makefile 2002-01-05 16:39:17.000000000 +0100
140+++ lm_sensors-2.8.0/prog/rrd/Makefile 2003-07-25 23:17:50.000000000 +0200
141@@ -22,7 +22,7 @@
142 sed -e "s#%%RRDPATH%%#$(RRDPATH)#g;s#%%APACHDIR%%#$(APACHDIR)#g;s#%%RRDDIR%%#$(RRDDIR)#g;s#%%MACH%%#$(MACH)#g" $< > $@
143
144 $(RRDDIR) :
145- install -d -o $(USER) $(RRDDIR)
146+ install -d $(RRDDIR)
147
148 $(RRDB) : $(RRDDIR)
149 ./sens_create_rrd $(RRDB)
150@@ -38,13 +38,13 @@
151 $(error error - Web server directory $(APACHE) not present - check APACHE definition in Makefile)
152
153 $(APACHDIR)/pix : $(APACHE)
154- install -d -o $(USER) -m 777 $(APACHDIR)/pix
155+ install -d -m 777 $(APACHDIR)/pix
3833b7e8 156
157 install: all $(RRDB) $(SENSDIR) $(CRONTAB) $(APACHDIR)/pix
158- install -o root -g root -m 755 sens_update_rrd $(BINPATH)
159- install -o root -g root -m 755 sens_week.cgi $(APACHDIR)
160- install -o root -g root -m 755 sens_day.cgi $(APACHDIR)
161- install -o root -g root -m 755 summ_week.cgi $(APACHDIR)
162+ install -m 755 sens_update_rrd $(BINPATH)
163+ install -m 755 sens_week.cgi $(APACHDIR)
164+ install -m 755 sens_day.cgi $(APACHDIR)
165+ install -m 755 summ_week.cgi $(APACHDIR)
166 # grep sens_update_rrd $(CRONTAB) > /dev/null 2>&1 || echo '*/5 * * * * /usr/local/bin/sens_update_rrd' $(RRDB) $(SENSDEV) >> $(CRONTAB)
167 @echo
168 @echo Note!!! You must manually install the following line in the crontab for user $(USER):
6f93b642
JB		 169diff -Nur lm_sensors-2.8.0.orig/prog/sensord/Module.mk lm_sensors-2.8.0/prog/sensord/Module.mk
170--- lm_sensors-2.8.0.orig/prog/sensord/Module.mk 2003-06-28 22:04:50.000000000 +0200
171+++ lm_sensors-2.8.0/prog/sensord/Module.mk 2003-07-25 23:18:02.000000000 +0200
f8d8907f 172@@ -45,8 +45,8 @@
beb2cb42
JR		 173
174 install-prog-sensord: all-prog-sensord
175 $(MKDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(PROGSENSORDMAN1DIR)
176- $(INSTALL) -o root -g root -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR)
177- $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR)
daea7adb
JB		 178+ $(INSTALL) -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR)
179+ $(INSTALL) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR)
6f93b642 180 user_install :: install-prog-sensord
beb2cb42
JR		 181
182 clean-prog-sensord:
6f93b642
JB		 183diff -Nur lm_sensors-2.8.0.orig/prog/sensors/Module.mk lm_sensors-2.8.0/prog/sensors/Module.mk
184--- lm_sensors-2.8.0.orig/prog/sensors/Module.mk 2003-06-28 22:04:50.000000000 +0200
185+++ lm_sensors-2.8.0/prog/sensors/Module.mk 2003-07-25 23:18:14.000000000 +0200
beb2cb42
JR		 186@@ -41,8 +41,8 @@
187
188 install-prog-sensors: all-prog-sensors
189 mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(PROGSENSORSMAN1DIR)
190- $(INSTALL) -o root -g root -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR)
191- $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR)
daea7adb
JB		 192+ $(INSTALL) -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR)
193+ $(INSTALL) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR)
6f93b642 194 user_install :: install-prog-sensors
beb2cb42
JR		 195
196 clean-prog-sensors:
Hardware health monitoring
This page took 0.114807 seconds and 4 git commands to generate.