[Buildroot] svn commit: trunk/buildroot/package/lm-sensors

thomasez at uclibc.org thomasez at uclibc.org
Fri Jan 25 09:46:23 UTC 2008


Author: thomasez
Date: 2008-01-25 01:46:21 -0800 (Fri, 25 Jan 2008)
New Revision: 20898

Log:
Upped version, lm-sensors.01.susv3-legacy.patch seems to not be needed 
any more but keeping it for now. Hopefully closing bug #1939


Added:
   trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch.not

Removed:
   trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch

Modified:
   trunk/buildroot/package/lm-sensors/lm-sensors.mk


Changeset:
Deleted: trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch
===================================================================
--- trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch	2008-01-24 22:49:15 UTC (rev 20897)
+++ trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch	2008-01-25 09:46:21 UTC (rev 20898)
@@ -1,57 +0,0 @@
-diff -rdup lm_sensors-2.10.4.oorig/lib/proc.c lm_sensors-2.10.4/lib/proc.c
---- lm_sensors-2.10.4.oorig/lib/proc.c	2007-07-17 06:53:06.000000000 +0200
-+++ lm_sensors-2.10.4/lib/proc.c	2007-09-20 13:30:39.000000000 +0200
-@@ -93,16 +93,16 @@ int sensors_read_proc_bus(void)
-   while (fgets(line,255,f)) {
-     if (strlen(line) > 0)
-       line[strlen(line)-1] = '\0';
--    if (! (border = rindex(line,'\t')))
-+    if (! (border = strrchr(line,'\t')))
-       goto ERROR;
-     /* Skip algorithm name */
-     *border='\0';
--    if (! (border = rindex(line,'\t')))
-+    if (! (border = strrchr(line,'\t')))
-       goto ERROR;
-     if (! (entry.adapter = strdup(border + 1)))
-       goto FAT_ERROR;
-     *border='\0';
--    if (! (border = rindex(line,'\t')))
-+    if (! (border = strrchr(line,'\t')))
-       goto ERROR;
-     *border='\0';
-     if (strncmp(line,"i2c-",4))
-@@ -155,8 +155,8 @@ int sensors_read_proc(sensors_chip_name 
- 		strcpy(n, name.busname);
- 		strcat(n, "/");
- 		strcpy(altn, n);
--		/* use rindex to append sysname to n */
--		getsysname(the_feature, rindex(n, '\0'), &mag, rindex(altn, '\0'));
-+		/* use strrchr to append sysname to n */
-+		getsysname(the_feature, strrchr(n, '\0'), &mag, strrchr(altn, '\0'));
- 		if ((f = fopen(n, "r")) != NULL
- 		 || (f = fopen(altn, "r")) != NULL) {
- 			int res = fscanf(f, "%lf", value);
-@@ -198,8 +198,8 @@ int sensors_write_proc(sensors_chip_name
- 		strcpy(n, name.busname);
- 		strcat(n, "/");
- 		strcpy(altn, n);
--		/* use rindex to append sysname to n */
--		getsysname(the_feature, rindex(n, '\0'), &mag, rindex(altn, '\0'));
-+		/* use strrchr to append sysname to n */
-+		getsysname(the_feature, strrchr(n, '\0'), &mag, strrchr(altn, '\0'));
- 		if ((f = fopen(n, "w")) != NULL
- 		 || (f = fopen(altn, "w")) != NULL) {
- 			for (; mag > 0; mag --)
-diff -rdup lm_sensors-2.10.4.oorig/prog/dump/i2cbusses.c lm_sensors-2.10.4/prog/dump/i2cbusses.c
---- lm_sensors-2.10.4.oorig/prog/dump/i2cbusses.c	2007-07-17 06:53:10.000000000 +0200
-+++ lm_sensors-2.10.4/prog/dump/i2cbusses.c	2007-09-20 13:29:19.000000000 +0200
-@@ -185,7 +185,7 @@ found:
- 				fprintf(stderr, "%s: read error\n", n);
- 				continue;
- 			}
--			if((border = index(x, '\n')) != NULL)
-+			if((border = strchr(x, '\n')) != NULL)
- 				*border = 0;
- 			if(count++ == 0 && !procfmt)
- 				fprintf(stderr,"  Installed I2C busses:\n");

Copied: trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch.not (from rev 20897, trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch)
===================================================================
--- trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch.not	                        (rev 0)
+++ trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch.not	2008-01-25 09:46:21 UTC (rev 20898)
@@ -0,0 +1,57 @@
+diff -rdup lm_sensors-2.10.4.oorig/lib/proc.c lm_sensors-2.10.4/lib/proc.c
+--- lm_sensors-2.10.4.oorig/lib/proc.c	2007-07-17 06:53:06.000000000 +0200
++++ lm_sensors-2.10.4/lib/proc.c	2007-09-20 13:30:39.000000000 +0200
+@@ -93,16 +93,16 @@ int sensors_read_proc_bus(void)
+   while (fgets(line,255,f)) {
+     if (strlen(line) > 0)
+       line[strlen(line)-1] = '\0';
+-    if (! (border = rindex(line,'\t')))
++    if (! (border = strrchr(line,'\t')))
+       goto ERROR;
+     /* Skip algorithm name */
+     *border='\0';
+-    if (! (border = rindex(line,'\t')))
++    if (! (border = strrchr(line,'\t')))
+       goto ERROR;
+     if (! (entry.adapter = strdup(border + 1)))
+       goto FAT_ERROR;
+     *border='\0';
+-    if (! (border = rindex(line,'\t')))
++    if (! (border = strrchr(line,'\t')))
+       goto ERROR;
+     *border='\0';
+     if (strncmp(line,"i2c-",4))
+@@ -155,8 +155,8 @@ int sensors_read_proc(sensors_chip_name 
+ 		strcpy(n, name.busname);
+ 		strcat(n, "/");
+ 		strcpy(altn, n);
+-		/* use rindex to append sysname to n */
+-		getsysname(the_feature, rindex(n, '\0'), &mag, rindex(altn, '\0'));
++		/* use strrchr to append sysname to n */
++		getsysname(the_feature, strrchr(n, '\0'), &mag, strrchr(altn, '\0'));
+ 		if ((f = fopen(n, "r")) != NULL
+ 		 || (f = fopen(altn, "r")) != NULL) {
+ 			int res = fscanf(f, "%lf", value);
+@@ -198,8 +198,8 @@ int sensors_write_proc(sensors_chip_name
+ 		strcpy(n, name.busname);
+ 		strcat(n, "/");
+ 		strcpy(altn, n);
+-		/* use rindex to append sysname to n */
+-		getsysname(the_feature, rindex(n, '\0'), &mag, rindex(altn, '\0'));
++		/* use strrchr to append sysname to n */
++		getsysname(the_feature, strrchr(n, '\0'), &mag, strrchr(altn, '\0'));
+ 		if ((f = fopen(n, "w")) != NULL
+ 		 || (f = fopen(altn, "w")) != NULL) {
+ 			for (; mag > 0; mag --)
+diff -rdup lm_sensors-2.10.4.oorig/prog/dump/i2cbusses.c lm_sensors-2.10.4/prog/dump/i2cbusses.c
+--- lm_sensors-2.10.4.oorig/prog/dump/i2cbusses.c	2007-07-17 06:53:10.000000000 +0200
++++ lm_sensors-2.10.4/prog/dump/i2cbusses.c	2007-09-20 13:29:19.000000000 +0200
+@@ -185,7 +185,7 @@ found:
+ 				fprintf(stderr, "%s: read error\n", n);
+ 				continue;
+ 			}
+-			if((border = index(x, '\n')) != NULL)
++			if((border = strchr(x, '\n')) != NULL)
+ 				*border = 0;
+ 			if(count++ == 0 && !procfmt)
+ 				fprintf(stderr,"  Installed I2C busses:\n");

Modified: trunk/buildroot/package/lm-sensors/lm-sensors.mk
===================================================================
--- trunk/buildroot/package/lm-sensors/lm-sensors.mk	2008-01-24 22:49:15 UTC (rev 20897)
+++ trunk/buildroot/package/lm-sensors/lm-sensors.mk	2008-01-25 09:46:21 UTC (rev 20898)
@@ -3,9 +3,9 @@
 # lm-sensors
 #
 #############################################################
-LM_SENSORS_VERSION:=2.10.4
+LM_SENSORS_VERSION:=2.10.5
 LM_SENSORS_SOURCE:=lm-sensors_$(LM_SENSORS_VERSION).orig.tar.gz
-LM_SENSORS_PATCH:=lm-sensors_$(LM_SENSORS_VERSION)-3.diff.gz
+LM_SENSORS_PATCH:=lm-sensors_$(LM_SENSORS_VERSION)-5.diff.gz
 LM_SENSORS_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/l/lm-sensors/
 LM_SENSORS_DIR:=$(BUILD_DIR)/lm_sensors-$(LM_SENSORS_VERSION)
 LM_SENSORS_CAT:=$(ZCAT)




More information about the buildroot mailing list