* [Buildroot] svn commit: trunk/buildroot/package/lm-sensors
@ 2008-06-23 11:53 jacmet at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: jacmet at uclibc.org @ 2008-06-23 11:53 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-23 04:53:41 -0700 (Mon, 23 Jun 2008)
New Revision: 22476
Log:
lm-sensors: bump version and cleanup
- Bump version to 3.0.2 which no longer needs libsysfs
- Set MACHINE correctly, so it doesn't try to build isa stuff for non-i386
- Cleanup make invocation
Modified:
trunk/buildroot/package/lm-sensors/Config.in
trunk/buildroot/package/lm-sensors/lm-sensors.mk
Changeset:
Modified: trunk/buildroot/package/lm-sensors/Config.in
===================================================================
--- trunk/buildroot/package/lm-sensors/Config.in 2008-06-23 11:53:35 UTC (rev 22475)
+++ trunk/buildroot/package/lm-sensors/Config.in 2008-06-23 11:53:41 UTC (rev 22476)
@@ -1,6 +1,5 @@
config BR2_PACKAGE_LM_SENSORS
bool "lm-sensors"
- select BR2_PACKAGE_LIBSYSFS
default n
help
Lm-sensors is a hardware health monitoring package for
Modified: trunk/buildroot/package/lm-sensors/lm-sensors.mk
===================================================================
--- trunk/buildroot/package/lm-sensors/lm-sensors.mk 2008-06-23 11:53:35 UTC (rev 22475)
+++ trunk/buildroot/package/lm-sensors/lm-sensors.mk 2008-06-23 11:53:41 UTC (rev 22476)
@@ -3,42 +3,25 @@
# lm-sensors
#
#############################################################
-LM_SENSORS_VERSION:=2.10.6
-LM_SENSORS_SOURCE:=lm-sensors_$(LM_SENSORS_VERSION).orig.tar.gz
-LM_SENSORS_PATCH:=lm-sensors_$(LM_SENSORS_VERSION)-2.diff.gz
-LM_SENSORS_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/l/lm-sensors/
+LM_SENSORS_VERSION:=3.0.2
+LM_SENSORS_SOURCE:=lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
+LM_SENSORS_SITE:=http://dl.lm-sensors.org/lm-sensors/releases
LM_SENSORS_DIR:=$(BUILD_DIR)/lm_sensors-$(LM_SENSORS_VERSION)
-LM_SENSORS_CAT:=$(ZCAT)
+LM_SENSORS_CAT:=$(BZCAT)
LM_SENSORS_BINARY:=prog/sensors/sensors
LM_SENSORS_TARGET_BINARY:=usr/bin/sensors
$(DL_DIR)/$(LM_SENSORS_SOURCE):
$(WGET) -P $(DL_DIR) $(LM_SENSORS_SITE)/$(LM_SENSORS_SOURCE)
-ifneq ($(LM_SENSORS_PATCH),)
-LM_SENSORS_PATCH_FILE:=$(DL_DIR)/$(LM_SENSORS_PATCH)
-$(DL_DIR)/$(LM_SENSORS_PATCH):
- $(WGET) -P $(DL_DIR) $(LM_SENSORS_SITE)/$(LM_SENSORS_PATCH)
-endif
-
-$(LM_SENSORS_DIR)/.unpacked: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(DL_DIR)/$(LM_SENSORS_PATCH)
+$(LM_SENSORS_DIR)/.unpacked: $(DL_DIR)/$(LM_SENSORS_SOURCE)
$(LM_SENSORS_CAT) $(DL_DIR)/$(LM_SENSORS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LM_SENSORS_DIR) package/lm-sensors/ lm-sensors\*.patch
-ifneq ($(LM_SENSORS_PATCH),)
- (cd $(LM_SENSORS_DIR) && \
- $(LM_SENSORS_CAT) $(LM_SENSORS_PATCH_FILE) | patch -p1)
- if [ -d $(LM_SENSORS_DIR)/debian/patches ]; then \
- toolchain/patch-kernel.sh $(LM_SENSORS_DIR) $(LM_SENSORS_DIR)/debian/patches \*.patch; \
- fi
-endif
- -$(SED) "s/-O[[:digit:]]//g" $(LM_SENSORS_DIR)/Makefile
touch $@
$(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY): $(LM_SENSORS_DIR)/.unpacked
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LM_SENSORS_DIR) \
- LINUX="$(LINUX_DIR)" KERNELVERSION=$(LINUX_HEADERS_VERSION) \
- I2C_HEADERS=$(LINUX_DIR)/include \
- DESTDIR=$(TARGET_DIR) user
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) MACHINE=$(KERNEL_ARCH)\
+ -C $(LM_SENSORS_DIR)
$(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY): $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY)
if [ ! -f $(TARGET_DIR)/etc/sensors.conf ]; then \
@@ -57,7 +40,7 @@
lm-sensors-unpacked: $(LM_SENSORS_DIR)/.unpacked
-lm-sensors: uclibc libsysfs $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY)
+lm-sensors: uclibc $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY)
lm-sensors-clean:
-$(MAKE) -C $(LM_SENSORS_DIR) clean
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lm-sensors
@ 2008-06-23 11:53 jacmet at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: jacmet at uclibc.org @ 2008-06-23 11:53 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-23 04:53:47 -0700 (Mon, 23 Jun 2008)
New Revision: 22477
Log:
lm-sensors: remove unused legacy patch
Removed:
trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch.not
Changeset:
Deleted: trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch.not
===================================================================
--- trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch.not 2008-06-23 11:53:41 UTC (rev 22476)
+++ trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch.not 2008-06-23 11:53:47 UTC (rev 22477)
@@ -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");
^ permalink raw reply [flat|nested] 9+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/lm-sensors
@ 2008-06-23 11:53 jacmet at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: jacmet at uclibc.org @ 2008-06-23 11:53 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-23 04:53:35 -0700 (Mon, 23 Jun 2008)
New Revision: 22475
Log:
lm-sensors: clean libsensors* from usr/lib, not lib
Modified:
trunk/buildroot/package/lm-sensors/lm-sensors.mk
Changeset:
Modified: trunk/buildroot/package/lm-sensors/lm-sensors.mk
===================================================================
--- trunk/buildroot/package/lm-sensors/lm-sensors.mk 2008-06-23 01:52:30 UTC (rev 22474)
+++ trunk/buildroot/package/lm-sensors/lm-sensors.mk 2008-06-23 11:53:35 UTC (rev 22475)
@@ -62,7 +62,7 @@
lm-sensors-clean:
-$(MAKE) -C $(LM_SENSORS_DIR) clean
rm -f $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) \
- $(TARGET_DIR)/lib/libsensors* \
+ $(TARGET_DIR)/usr/lib/libsensors* \
$(TARGET_DIR)/etc/sensors.conf
lm-sensors-dirclean:
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lm-sensors
@ 2008-05-11 6:43 ulf at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: ulf at uclibc.org @ 2008-05-11 6:43 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-05-10 23:43:50 -0700 (Sat, 10 May 2008)
New Revision: 21965
Log:
Bump lm-sensors version
Modified:
trunk/buildroot/package/lm-sensors/lm-sensors.mk
Changeset:
Modified: trunk/buildroot/package/lm-sensors/lm-sensors.mk
===================================================================
--- trunk/buildroot/package/lm-sensors/lm-sensors.mk 2008-05-11 06:43:22 UTC (rev 21964)
+++ trunk/buildroot/package/lm-sensors/lm-sensors.mk 2008-05-11 06:43:50 UTC (rev 21965)
@@ -3,9 +3,9 @@
# lm-sensors
#
#############################################################
-LM_SENSORS_VERSION:=2.10.5
+LM_SENSORS_VERSION:=2.10.6
LM_SENSORS_SOURCE:=lm-sensors_$(LM_SENSORS_VERSION).orig.tar.gz
-LM_SENSORS_PATCH:=lm-sensors_$(LM_SENSORS_VERSION)-5.diff.gz
+LM_SENSORS_PATCH:=lm-sensors_$(LM_SENSORS_VERSION)-2.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)
@@ -21,8 +21,6 @@
$(WGET) -P $(DL_DIR) $(LM_SENSORS_SITE)/$(LM_SENSORS_PATCH)
endif
-lm-sensors-source: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(LM_SENSORS_PATCH_FILE)
-
$(LM_SENSORS_DIR)/.unpacked: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(DL_DIR)/$(LM_SENSORS_PATCH)
$(LM_SENSORS_CAT) $(DL_DIR)/$(LM_SENSORS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LM_SENSORS_DIR) package/lm-sensors/ lm-sensors\*.patch
@@ -55,6 +53,10 @@
-$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/lib/libsensors.so*
$(STRIPCMD) $(STRIP_STRIP_ALL) $@
+lm-sensors-source: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(LM_SENSORS_PATCH_FILE)
+
+lm-sensors-unpacked: $(LM_SENSORS_DIR)/.unpacked
+
lm-sensors: uclibc libsysfs $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY)
lm-sensors-clean:
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lm-sensors
@ 2008-01-25 9:46 thomasez at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: thomasez at uclibc.org @ 2008-01-25 9:46 UTC (permalink / raw)
To: buildroot
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)
^ permalink raw reply [flat|nested] 9+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/lm-sensors
@ 2007-10-30 21:37 ulf at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: ulf at uclibc.org @ 2007-10-30 21:37 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-10-30 14:37:39 -0700 (Tue, 30 Oct 2007)
New Revision: 20339
Log:
Fix patch version for lm-sensors
Modified:
trunk/buildroot/package/lm-sensors/lm-sensors.mk
Changeset:
Modified: trunk/buildroot/package/lm-sensors/lm-sensors.mk
===================================================================
--- trunk/buildroot/package/lm-sensors/lm-sensors.mk 2007-10-30 21:32:09 UTC (rev 20338)
+++ trunk/buildroot/package/lm-sensors/lm-sensors.mk 2007-10-30 21:37:39 UTC (rev 20339)
@@ -5,7 +5,7 @@
#############################################################
LM_SENSORS_VERSION:=2.10.4
LM_SENSORS_SOURCE:=lm-sensors_$(LM_SENSORS_VERSION).orig.tar.gz
-LM_SENSORS_PATCH:=lm-sensors_$(LM_SENSORS_VERSION)-1.diff.gz
+LM_SENSORS_PATCH:=lm-sensors_$(LM_SENSORS_VERSION)-3.diff.gz
LM_SENSORS_SITE:=http://ftp.debian.org/debian/pool/main/l/lm-sensors/
LM_SENSORS_DIR:=$(BUILD_DIR)/lm_sensors-$(LM_SENSORS_VERSION)
LM_SENSORS_CAT:=$(ZCAT)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lm-sensors
@ 2007-09-20 11:38 aldot at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: aldot at uclibc.org @ 2007-09-20 11:38 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-20 04:38:19 -0700 (Thu, 20 Sep 2007)
New Revision: 19908
Log:
- don't use functions that are marked LEGACY in SUSv3
Added:
trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch
Modified:
trunk/buildroot/package/lm-sensors/lm-sensors.mk
Changeset:
Added: trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch
===================================================================
--- trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch (rev 0)
+++ trunk/buildroot/package/lm-sensors/lm-sensors.01.susv3-legacy.patch 2007-09-20 11:38:19 UTC (rev 19908)
@@ -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 2007-09-20 11:14:47 UTC (rev 19907)
+++ trunk/buildroot/package/lm-sensors/lm-sensors.mk 2007-09-20 11:38:19 UTC (rev 19908)
@@ -6,7 +6,7 @@
LM_SENSORS_VERSION:=2.10.4
LM_SENSORS_SOURCE:=lm-sensors_$(LM_SENSORS_VERSION).orig.tar.gz
LM_SENSORS_PATCH:=lm-sensors_$(LM_SENSORS_VERSION)-1.diff.gz
-LM_SENSORS_SITE:=ftp://ftp.debian.org/debian/pool/main/l/lm-sensors/
+LM_SENSORS_SITE:=http://ftp.debian.org/debian/pool/main/l/lm-sensors/
LM_SENSORS_DIR:=$(BUILD_DIR)/lm_sensors-$(LM_SENSORS_VERSION)
LM_SENSORS_CAT:=$(ZCAT)
LM_SENSORS_BINARY:=prog/sensors/sensors
@@ -15,16 +15,20 @@
$(DL_DIR)/$(LM_SENSORS_SOURCE):
$(WGET) -P $(DL_DIR) $(LM_SENSORS_SITE)/$(LM_SENSORS_SOURCE)
+ifneq ($(LM_SENSORS_PATCH),)
+LM_SENSORS_PATCH_FILE:=$(DL_DIR)/$(LM_SENSORS_PATCH)
$(DL_DIR)/$(LM_SENSORS_PATCH):
$(WGET) -P $(DL_DIR) $(LM_SENSORS_SITE)/$(LM_SENSORS_PATCH)
+endif
-lm-sensors-source: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(DL_DIR)/$(LM_SENSORS_PATCH)
+lm-sensors-source: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(LM_SENSORS_PATCH_FILE)
$(LM_SENSORS_DIR)/.unpacked: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(DL_DIR)/$(LM_SENSORS_PATCH)
$(LM_SENSORS_CAT) $(DL_DIR)/$(LM_SENSORS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LM_SENSORS_DIR) package/lm-sensors/ lm-sensors\*.patch
ifneq ($(LM_SENSORS_PATCH),)
- (cd $(LM_SENSORS_DIR) && $(LM_SENSORS_CAT) $(DL_DIR)/$(LM_SENSORS_PATCH) | patch -p1)
+ (cd $(LM_SENSORS_DIR) && \
+ $(LM_SENSORS_CAT) $(LM_SENSORS_PATCH_FILE) | patch -p1)
if [ -d $(LM_SENSORS_DIR)/debian/patches ]; then \
toolchain/patch-kernel.sh $(LM_SENSORS_DIR) $(LM_SENSORS_DIR)/debian/patches \*.patch; \
fi
^ permalink raw reply [flat|nested] 9+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/lm-sensors
@ 2007-09-14 18:48 aldot at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: aldot at uclibc.org @ 2007-09-14 18:48 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-14 11:48:44 -0700 (Fri, 14 Sep 2007)
New Revision: 19831
Log:
- touchup a few bits that the submitter should have done in the first place
Modified:
trunk/buildroot/package/lm-sensors/lm-sensors.mk
Changeset:
Modified: trunk/buildroot/package/lm-sensors/lm-sensors.mk
===================================================================
--- trunk/buildroot/package/lm-sensors/lm-sensors.mk 2007-09-14 11:25:29 UTC (rev 19830)
+++ trunk/buildroot/package/lm-sensors/lm-sensors.mk 2007-09-14 18:48:44 UTC (rev 19831)
@@ -29,6 +29,7 @@
toolchain/patch-kernel.sh $(LM_SENSORS_DIR) $(LM_SENSORS_DIR)/debian/patches \*.patch; \
fi
endif
+ -$(SED) "s/-O[[:digit:]]//g" $(LM_SENSORS_DIR)/Makefile
touch $@
$(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY): $(LM_SENSORS_DIR)/.unpacked
@@ -38,6 +39,12 @@
DESTDIR=$(TARGET_DIR) user
$(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY): $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY)
+ if [ ! -f $(TARGET_DIR)/etc/sensors.conf ]; then \
+ cp -dpf $(LM_SENSORS_DIR)/etc/sensors.conf.eg \
+ $(TARGET_DIR)/etc/sensors.conf; \
+ $(SED) '/^#/d' -e '/^[[:space:]]*$$/d' \
+ $(TARGET_DIR)/etc/sensors.conf; \
+ fi
cp -dpf $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY) $@
cp -dpf $(LM_SENSORS_DIR)/lib/libsensors.so* \
$(LM_SENSORS_DIR)/lib/libsensors.a $(TARGET_DIR)/usr/lib/
@@ -48,7 +55,9 @@
lm-sensors-clean:
-$(MAKE) -C $(LM_SENSORS_DIR) clean
- rm -f $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY)
+ rm -f $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) \
+ $(TARGET_DIR)/lib/libsensors* \
+ $(TARGET_DIR)/etc/sensors.conf
lm-sensors-dirclean:
rm -rf $(LM_SENSORS_DIR)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lm-sensors
@ 2007-09-14 11:25 aldot at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: aldot at uclibc.org @ 2007-09-14 11:25 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-14 04:25:29 -0700 (Fri, 14 Sep 2007)
New Revision: 19830
Log:
- also copy the needed libs
Modified:
trunk/buildroot/package/lm-sensors/lm-sensors.mk
Changeset:
Modified: trunk/buildroot/package/lm-sensors/lm-sensors.mk
===================================================================
--- trunk/buildroot/package/lm-sensors/lm-sensors.mk 2007-09-13 20:20:44 UTC (rev 19829)
+++ trunk/buildroot/package/lm-sensors/lm-sensors.mk 2007-09-14 11:25:29 UTC (rev 19830)
@@ -39,6 +39,9 @@
$(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY): $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY)
cp -dpf $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY) $@
+ cp -dpf $(LM_SENSORS_DIR)/lib/libsensors.so* \
+ $(LM_SENSORS_DIR)/lib/libsensors.a $(TARGET_DIR)/usr/lib/
+ -$(STRIP) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/lib/libsensors.so*
$(STRIP) $(STRIP_STRIP_ALL) $@
lm-sensors: uclibc libsysfs $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY)
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2008-06-23 11:53 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-23 11:53 [Buildroot] svn commit: trunk/buildroot/package/lm-sensors jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-06-23 11:53 jacmet at uclibc.org
2008-06-23 11:53 jacmet at uclibc.org
2008-05-11 6:43 ulf at uclibc.org
2008-01-25 9:46 thomasez at uclibc.org
2007-10-30 21:37 ulf at uclibc.org
2007-09-20 11:38 aldot at uclibc.org
2007-09-14 18:48 aldot at uclibc.org
2007-09-14 11:25 aldot at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox