packages/rrdcollect: fix linking against rrdtool by splitting it into 2 packages

[packages.git] / utils / lm-sensors / Makefile

diff --git a/utils/lm-sensors/Makefile b/utils/lm-sensors/Makefile
index 63e1a22..35d39fe 100644 (file)
--- a/utils/lm-sensors/Makefile
+++ b/utils/lm-sensors/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 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.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lm-sensors
-PKG_VERSION:=3.2.0
+PKG_VERSION:=3.3.0
 PKG_RELEASE:=2
 
 PKG_SOURCE:=lm_sensors-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://dl.lm-sensors.org/lm-sensors/releases/
-PKG_MD5SUM:=829d88fb09d67723fbf42853eb84d1fd
+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
@@ -23,6 +23,7 @@ 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
@@ -33,6 +34,14 @@ define Package/lm-sensors
   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
@@ -41,11 +50,15 @@ define Package/libsensors
 endef
 
 define Package/lm-sensors/description
-       Utility to read hardware sensor data
+ 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
+ lm-sensors libraries
 endef
 
 define Package/lm-sensors/conffiles
@@ -72,22 +85,28 @@ define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) \
                $(PKG_BUILD_DIR)/lib/libsensors.{a,so*} \
-               $(1)/usr/lib/
+               $(1)/usr/lib
 endef
 
 define Package/lm-sensors/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/prog/sensors/sensors $(1)/usr/sbin/
-       $(INSTALL_BIN) $(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
        $(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
-       $(CP) $(PKG_BUILD_DIR)/lib/libsensors.so* $(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))