[leaf-commits] src/bering-uclibc4/source/lmsensors lm_sensors-3.2.0.tar.bz2, NONE, 1.1 buildtool.cfg, 1.1.1.1, 1.2 buildtool.mk, 1.1.1.1, 1.2

david M brooke <[email protected]>
Newsgroups gmane.linux.leaf.cvs
Message-ID <[email protected]> 
Update of /cvsroot/leaf/src/bering-uclibc4/source/lmsensors
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv6407

Modified Files:
	buildtool.cfg buildtool.mk 
Added Files:
	lm_sensors-3.2.0.tar.bz2 
Log Message:
Upgraded to latest upstream to fix runtime error on BuC 4.x

--- NEW FILE: lm_sensors-3.2.0.tar.bz2 ---
(This appears to be a binary file; contents omitted.)

Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/lmsensors/buildtool.cfg,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** buildtool.cfg	26 Apr 2010 09:03:11 -0000	1.1.1.1
--- buildtool.cfg	21 Oct 2010 19:36:41 -0000	1.2
***************
*** 5,9 ****
  </File>
  
! <File lm_sensors-2.10.2.tar.gz>
          Server = cvs4-sourceforge
  	Revision = HEAD
--- 5,9 ----
  </File>
  
! <File lm_sensors-3.2.0.tar.bz2>
          Server = cvs4-sourceforge
  	Revision = HEAD
***************
*** 12,22 ****
  </File>
  
- <File Makefile.patch.gz>
-         Server = cvs4-sourceforge
- 	Revision = HEAD
-         Directory = lmsensors
- 	envname = LMSENSORS_PATCH1
- </File>
- 
  <File lm-sensors.init>
          Server = cvs4-sourceforge
--- 12,15 ----
***************
*** 27,38 ****
  <Package>
  	<libsens>
! 		Version = 3.1.2
  		Revision = 1
  		
  		Help <<EOF
! 		Libsensors package. You need the lm-sensors kernel modules
! 		for your specific hardware.
! 		Homepage: http://secure.netroedge.com/~lm78/
! 		Requires: libm.lrp
  		LEAF Package by __PACKAGER__, __BUILDDATE__
  		EOF
--- 20,33 ----
  <Package>
  	<libsens>
! 		# Despite the .so file showing version 4.3.0, running
! 		# command "sensors -v" reports:
! 		#     sensors version 3.2.0 with libsensors version 3.2.0
! 		# so it seems best to label libsensors.lrp as 3.2.0
! 		Version = 3.2.0
  		Revision = 1
  		
  		Help <<EOF
! 		Libsensors package.
! 		Homepage: http://www.lm-sensors.org/
  		LEAF Package by __PACKAGER__, __BUILDDATE__
  		EOF
***************
*** 49,65 ****
  		<Contents>
  			<File>
! 				Filename	= usr/lib/libsensors.so.3.1.2
! 				Source		= usr/lib/libsensors.so.3.1.2
  				Type		= binary
  				Permissions	= 755
  			</File>
  			<File>
! 				Filename	= usr/lib/libsensors.so.3
! 				Target		= usr/lib/libsensors.so.3.1.2
  				Type		= link
  			</File>
  			<File>
! 				Filename	= etc/sensors.conf
! 				Source		= etc/sensors.conf
  				Type		= binary
  				Type		= local
--- 44,65 ----
  		<Contents>
  			<File>
! 				Filename	= usr/lib/libsensors.so.4.3.0
! 				Source		= usr/lib/libsensors.so.4.3.0
  				Type		= binary
  				Permissions	= 755
  			</File>
  			<File>
! 				Filename	= usr/lib/libsensors.so.4
! 				Target		= usr/lib/libsensors.so.4.3.0
  				Type		= link
  			</File>
  			<File>
! 				Filename	= usr/lib/libsensors.so
! 				Target		= usr/lib/libsensors.so.4.3.0
! 				Type		= link
! 			</File>
! 			<File>
! 				Filename	= etc/sensors3.conf
! 				Source		= etc/sensors3.conf
  				Type		= binary
  				Type		= local
***************
*** 71,82 ****
  	</libsens>
  	<sensors>
! 		Version = 2.10.2
  		Revision = 1
  		
  		Help <<EOF
! 		Sensors is used to show the current readings of all sensor chips 
  		and to set all limits as specified in the configuration file.
! 		Homepage: http://secure.netroedge.com/~lm78/
! 		Requires: libsens.lrp
  		LEAF Package by __PACKAGER__, __BUILDDATE__
  		EOF
--- 71,82 ----
  	</libsens>
  	<sensors>
! 		Version = 3.2.0
  		Revision = 1
  		
  		Help <<EOF
! 		Sensors is used to show the current readings of sensor chips 
  		and to set all limits as specified in the configuration file.
! 		Homepage: http://www.lm-sensors.org/
! 		Requires: libsens.lrp, libm.lrp
  		LEAF Package by __PACKAGER__, __BUILDDATE__
  		EOF
***************
*** 99,102 ****
--- 99,108 ----
  			</File>
  			<File>
+ 				Filename	= usr/sbin/sensors-detect
+ 				Source		= usr/sbin/sensors-detect
+ 				Type		= binary
+ 				Permissions	= 755
+ 			</File>
+ 			<File>
  				Filename	= etc/init.d/lm-sensors
  				Source		= etc/init.d/lm-sensors

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/lmsensors/buildtool.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** buildtool.mk	26 Apr 2010 09:03:11 -0000	1.1.1.1
--- buildtool.mk	21 Oct 2010 19:36:41 -0000	1.2
***************
*** 3,18 ****
  # lmsensors
  #
- # $Id$
  #############################################################
  
  include $(MASTERMAKEFILE)
  
! LMSENSORS_DIR:=lm_sensors-2.10.2
  LMSENSORS_TARGET_DIR:=$(BT_BUILD_DIR)/lmsensors
- STRIP_OPTIONS=--strip-debug
  
  $(LMSENSORS_DIR)/.source:
! 	zcat $(LMSENSORS_SOURCE) | tar -xvf -	
! 	zcat $(LMSENSORS_PATCH1) | patch -d $(LMSENSORS_DIR) -p1 
  	touch $(LMSENSORS_DIR)/.source
  
--- 3,19 ----
  # lmsensors
  #
  #############################################################
  
  include $(MASTERMAKEFILE)
  
! LMSENSORS_DIR:=$(shell $(BT_TGZ_GETDIRNAME) $(LMSENSORS_SOURCE) 2>/dev/null )
! ifeq ($(LMSENSORS_DIR),)
! LMSENSORS_DIR:=$(shell cat DIRNAME)
! endif
  LMSENSORS_TARGET_DIR:=$(BT_BUILD_DIR)/lmsensors
  
  $(LMSENSORS_DIR)/.source:
! 	bzcat $(LMSENSORS_SOURCE) | tar -xvf -	
! 	echo $(IPVSADM_DIR) > DIRNAME
  	touch $(LMSENSORS_DIR)/.source
  
***************
*** 22,40 ****
  	-mkdir $(LMSENSORS_TARGET_DIR)/
  	-mkdir -p $(BT_STAGING_DIR)/usr/bin
  	-mkdir -p $(BT_STAGING_DIR)/usr/lib
  	-mkdir -p $(BT_STAGING_DIR)/etc/init.d
! 	echo $(BT_KERNEL_RELEASE)
! 	$(MAKE) CC=$(TARGET_CC) LINUX=$(BT_LINUX_DIR) LINUX_HEADERS=$(BT_LINUX_DIR)/include I2C_HEADERS=$(BT_STAGING_DIR)/usr/include DESTDIR=$(LMSENSORS_TARGET_DIR) PREFIX=/usr MODPREF=/lib/modules/$(BT_KERNEL_RELEASE)/ -C $(LMSENSORS_DIR) user
! 	$(MAKE) CC=$(TARGET_CC) LINUX=$(BT_LINUX_DIR) LINUX_HEADERS=$(BT_LINUX_DIR)/include I2C_HEADERS=$(BT_STAGING_DIR)/usr/include DESTDIR=$(LMSENSORS_TARGET_DIR) PREFIX=/usr MODPREF=/lib/modules/$(BT_KERNEL_RELEASE)/ -C $(LMSENSORS_DIR) user_install 	
  	-$(BT_STRIP) $(BT_STRIP_BINOPTS) $(LMSENSORS_TARGET_DIR)/usr/bin/*
  	-$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(LMSENSORS_TARGET_DIR)/usr/lib/*
- 	-$(BT_STRIP) $(BT_STRIP_BINOPTS) $(LMSENSORS_TARGET_DIR)/usr/sbin/*
  	cp -a lm-sensors.init $(BT_STAGING_DIR)/etc/init.d/lm-sensors
  	cp -a $(LMSENSORS_TARGET_DIR)/usr/bin/sensors $(BT_STAGING_DIR)/usr/bin 
  	cp -a $(LMSENSORS_TARGET_DIR)/usr/lib/libsensors.* $(BT_STAGING_DIR)/usr/lib
! 	cp -a $(LMSENSORS_TARGET_DIR)/etc/sensors.conf $(BT_STAGING_DIR)/etc
  	cp -a $(LMSENSORS_TARGET_DIR)/usr/include/ $(BT_STAGING_DIR)/include
- 	$(BT_DEPMOD) -ae -b $(BT_STAGING_DIR) -r -F $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/build/System.map $(BT_KERNEL_RELEASE)  	
- 	
  	touch $(LMSENSORS_DIR)/.build
  
--- 23,39 ----
  	-mkdir $(LMSENSORS_TARGET_DIR)/
  	-mkdir -p $(BT_STAGING_DIR)/usr/bin
+ 	-mkdir -p $(BT_STAGING_DIR)/usr/sbin
  	-mkdir -p $(BT_STAGING_DIR)/usr/lib
  	-mkdir -p $(BT_STAGING_DIR)/etc/init.d
! 	$(MAKE) CC=$(TARGET_CC) DESTDIR=$(LMSENSORS_TARGET_DIR) PREFIX=/usr MACHINE=i686 -C $(LMSENSORS_DIR) user
! 	$(MAKE) CC=$(TARGET_CC) DESTDIR=$(LMSENSORS_TARGET_DIR) PREFIX=/usr MACHINE=i686 -C $(LMSENSORS_DIR) user_install 	
  	-$(BT_STRIP) $(BT_STRIP_BINOPTS) $(LMSENSORS_TARGET_DIR)/usr/bin/*
  	-$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(LMSENSORS_TARGET_DIR)/usr/lib/*
  	cp -a lm-sensors.init $(BT_STAGING_DIR)/etc/init.d/lm-sensors
  	cp -a $(LMSENSORS_TARGET_DIR)/usr/bin/sensors $(BT_STAGING_DIR)/usr/bin 
+ 	cp -a $(LMSENSORS_TARGET_DIR)/usr/sbin/sensors-detect $(BT_STAGING_DIR)/usr/sbin 
  	cp -a $(LMSENSORS_TARGET_DIR)/usr/lib/libsensors.* $(BT_STAGING_DIR)/usr/lib
! 	cp -a $(LMSENSORS_TARGET_DIR)/etc/sensors3.conf $(BT_STAGING_DIR)/etc
  	cp -a $(LMSENSORS_TARGET_DIR)/usr/include/ $(BT_STAGING_DIR)/include
  	touch $(LMSENSORS_DIR)/.build
  
***************
*** 42,46 ****
  
  clean:
! 	$(MAKE) LINUX=$(BT_LINUX_DIR) SMP=0 MODVER=1 DESTDIR=$(LMSENSORS_TARGET_DIR) PREFIX=/usr MODPREF=/lib/modules/$(BT_KERNEL_RELEASE)/ -C $(LMSENSORS_DIR) clean 
  	rm -f $(LMSENSORS_DIR)/.build
  
--- 41,45 ----
  
  clean:
! 	$(MAKE) DESTDIR=$(LMSENSORS_TARGET_DIR) -C $(LMSENSORS_DIR) clean 
  	rm -f $(LMSENSORS_DIR)/.build
  
***************
*** 48,49 ****
--- 47,50 ----
  	rm -rf $(LMSENSORS_DIR)
  	rm -rf $(LMSENSORS_TARGET_DIR)
+ 	rm DIRNAME
+ 


------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.