X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=utils%2Flm-sensors%2FMakefile;h=35d39fe52475c93f33e185431e45936eaa068496;hb=4b84fa92c16c71b1603667a6ad773419ad7211d9;hp=99eae9395d83d29146e1cc81250baf7d7c459815;hpb=dc3a3c8887d806580210b259db241fd906af7fef;p=packages.git

diff --git a/utils/lm-sensors/Makefile b/utils/lm-sensors/Makefile
index 99eae9395..35d39fe52 100644
--- a/utils/lm-sensors/Makefile
+++ b/utils/lm-sensors/Makefile
@@ -1,54 +1,112 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lm-sensors
-PKG_VERSION:=2.10.3
-PKG_RELEASE:=1
+PKG_VERSION:=3.3.0
+PKG_RELEASE:=2
 
-PKG_SOURCE:=lm_sensors-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dl.lm-sensors.org/lm-sensors/releases/
-PKG_MD5SUM:=55d77146fbd56c205a9f81d262b9453c
-PKG_CAT:=zcat
+PKG_SOURCE:=lm_sensors-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://dl.lm-sensors.org/lm-sensors/releases
+PKG_MD5SUM:=5eb18d7531ead4f54f28a1133a606535
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/lm_sensors-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/lm-sensors/Default
+  DEPENDS:=+sysfsutils
+  URL:=http://www.lm-sensors.org/
+  MAINTAINER:=Luka Perkov <openwrt@lukaperkov.net>
+endef
+
 define Package/lm-sensors
+  $(call Package/lm-sensors/Default)
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=lm-sensors
-  DEPENDS:=+sysfsutils @LINUX_2_6_X86
-  DESCRIPTION:=\
-	Utility to read hardware sensor data
-  URL:=http://www.lm-sensors.org/
+  DEPENDS+=+libsensors
+endef
+
+define Package/lm-sensors-detect
+  $(call Package/lm-sensors/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=lm-sensors-detect
+  DEPENDS+=+lm-sensors +perl +perlbase-essential +perlbase-fcntl +perlbase-file +perlbase-xsloader
+endef
+
+define Package/libsensors
+  $(call Package/lm-sensors/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=libsensors
+endef
+
+define Package/lm-sensors/description
+ Utility to read hardware sensor data
+endef
+
+define Package/lm-sensors-detect/description
+ Script to autodetect sensor hardware
+endef
+
+define Package/libsensors/description
+ lm-sensors libraries
+endef
+
+define Package/lm-sensors/conffiles
+/etc/sensors.conf
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
 		KERNELVERSION="$(LINUX_VERSION)" \
 		LINUX="$(LINUX_DIR)" \
 		CC="$(TARGET_CC)" \
 		STAGING_DIR="$(STAGING_DIR)" \
+		PREFIX="/usr" \
+		MACHINE="$(ARCH)" \
 		user
 endef
 
-define Package/lm-sensors/install
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/sensors
+	$(CP) \
+		$(PKG_BUILD_DIR)/lib/sensors.h \
+		$(1)/usr/include/sensors
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libsensors.so* $(1)/usr/lib/
+	$(CP) \
+		$(PKG_BUILD_DIR)/lib/libsensors.{a,so*} \
+		$(1)/usr/lib
+endef
+
+define Package/lm-sensors/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/prog/sensors/sensors $(1)/usr/sbin/
-	$(CP) $(PKG_BUILD_DIR)/prog/detect/i2cdetect $(1)/usr/sbin/
-	$(CP) $(PKG_BUILD_DIR)/prog/detect/sensors-detect $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/prog/sensors/sensors $(1)/usr/sbin
+ifeq ($(ARCH),i386)
 	$(INSTALL_DIR) $(1)/etc
-	$(CP) files/sensors.conf $(1)/etc/sensors.conf
+	$(INSTALL_CONF) ./files/sensors.conf $(1)/etc/sensors.conf
+endif
+endef
+
+define Package/lm-sensors-detect/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/prog/detect/sensors-detect $(1)/usr/sbin
+endef
+
+define Package/libsensors/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/libsensors.so* $(1)/usr/lib
 endef
 
 $(eval $(call BuildPackage,lm-sensors))
+$(eval $(call BuildPackage,lm-sensors-detect))
+$(eval $(call BuildPackage,libsensors))