[packages] iputils: fix Makefile error, fix arping dependency on libsysfs, bump relea...

[openwrt/svn-archive/archive.git] / utils / lm-sensors / Makefile

diff --git a/utils/lm-sensors/Makefile b/utils/lm-sensors/Makefile
index 6c51d3d7fe3c4694d8f47a54df7d45f3c0356588..8f3a80e99b27fa3e80843443d6f8b6e5e2fd2499 100644 (file)
--- a/utils/lm-sensors/Makefile
+++ b/utils/lm-sensors/Makefile
@@ -1,56 +1,81 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2009 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_VERSION:=3.1.1
 PKG_RELEASE:=1
 
-PKG_SOURCE:=lm_sensors-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=lm_sensors-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://dl.lm-sensors.org/lm-sensors/releases/
-PKG_MD5SUM:=55d77146fbd56c205a9f81d262b9453c
-PKG_CAT:=zcat
+PKG_MD5SUM:=613d7cfa23b70c0abae3fabb0a72ff5f
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/lm_sensors-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/lm-sensors
+define Package/lm-sensors/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=lm-sensors
-  DEPENDS:=+sysfsutils @LINUX_2_6_X86
+  DEPENDS:=+sysfsutils @LINUX_2_6
   URL:=http://www.lm-sensors.org/
 endef
 
+define Package/lm-sensors
+  $(call Package/lm-sensors/Default)
+  TITLE+= (programs)
+  DEPENDS+= +libsensors @TARGET_x86
+endef
+
+define Package/libsensors
+  $(call Package/lm-sensors/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= libraries
+endef
+
 define Package/lm-sensors/description
        Utility to read hardware sensor data
 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) \
                KERNELVERSION="$(LINUX_VERSION)" \
                LINUX="$(LINUX_DIR)" \
                CC="$(TARGET_CC)" \
                STAGING_DIR="$(STAGING_DIR)" \
+               PREFIX="/usr" \
+               MACHINE="$(ARCH)" \
                user
 endef
 
 define Package/lm-sensors/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/lib/libsensors.so* $(1)/usr/lib/
        $(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/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/prog/detect/sensors-detect $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc
-       $(CP) files/sensors.conf $(1)/etc/sensors.conf
+       $(INSTALL_CONF) ./files/sensors.conf $(1)/etc/sensors.conf
 endef
 
+define Package/libsensors/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/lib/libsensors.so* $(1)/usr/lib/
+endef
+
+
 $(eval $(call BuildPackage,lm-sensors))
+$(eval $(call BuildPackage,libsensors))