From: Luka Perkov <luka@openwrt.org>
Date: Fri, 20 Sep 2013 02:00:07 +0000 (+0000)
Subject: [packages] i2c-tools: update to svn r6199
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=e1f2f93bc1620cee59f2adb409ba332c00da9222

[packages] i2c-tools: update to svn r6199

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38082
---

diff --git a/utils/i2c-tools/Makefile b/utils/i2c-tools/Makefile
index 9ef752baaa..7085dd5827 100644
--- a/utils/i2c-tools/Makefile
+++ b/utils/i2c-tools/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2011 OpenWrt.org
+# Copyright (C) 2007-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,47 +9,56 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=i2c-tools
-PKG_VERSION:=3.1.0
+PKG_VERSION:=2013-09-19
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://dl.lm-sensors.org/i2c-tools/releases
-PKG_MD5SUM:=f15019e559e378c6e9d5d6299a00df21
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_URL:=http://lm-sensors.org/svn/i2c-tools/trunk
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=r6199
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
+PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=PACKAGE_python-smbus:python
 
 include $(INCLUDE_DIR)/package.mk
 $(call include_mk, python-package.mk)
 
+define Package/i2c/Default
+  URL:=http://lm-sensors.org/wiki/I2CTools
+  TITLE:=I2C
+endef
+
+define Package/libi2c
+  $(call Package/i2c/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+=library
+endef
+
 define Package/i2c-tools
+  $(call Package/i2c/Default)
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=I2C tools for Linux
-  URL:=http://www.lm-sensors.org/wiki/I2CTools
+  TITLE+=tools for Linux
+  DEPENDS:=+libi2c
 endef
 
 define Package/python-smbus
+  $(call Package/i2c/Default)
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Python bindings for the SMBUS
-  URL:=http://www.lm-sensors.org/wiki/I2CTools
-  DEPENDS:= +PACKAGE_python-smbus:python-mini +i2c-tools
+  DEPENDS:=+PACKAGE_python-smbus:python-mini +i2c-tools
 endef
 
 define Package/i2c-tools/description
  This package contains an heterogeneous set of I2C tools for Linux. These tools
  were originally part of the lm-sensors package.
- Includes:
- - i2cdetect
- - i2cdump
- - i2cget
- - i2cset
 endef
 
 define Package/python-smbus/description
- This package contains an heterogeneous set of I2C tools for Linux.
-
  This package contain the python bindings for Linux SMBus access through i2c-dev.
 endef
 
@@ -73,6 +82,16 @@ define Build/Compile
 	$(Build/Compile/python-smbus)
 endef
 
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/libi2c.so* $(1)/usr/lib/
+endef
+
+define Package/libi2c/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/libi2c.so* $(1)/usr/lib/
+endef
+
 define Package/i2c-tools/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/i2cdetect $(1)/usr/sbin/
@@ -85,6 +104,7 @@ define PyPackage/python-smbus/filespec
 +|$(PYTHON_PKG_DIR)/smbus.so
 endef
 
+$(eval $(call BuildPackage,libi2c))
 $(eval $(call BuildPackage,i2c-tools))
 $(eval $(call PyPackage,python-smbus))
 $(eval $(call BuildPackage,python-smbus))
diff --git a/utils/i2c-tools/patches/100-linux_include.patch b/utils/i2c-tools/patches/100-linux_include.patch
deleted file mode 100644
index addfc5bc3b..0000000000
--- a/utils/i2c-tools/patches/100-linux_include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/py-smbus/smbusmodule.c
-+++ b/py-smbus/smbusmodule.c
-@@ -21,6 +21,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <fcntl.h>
-+#include <linux/i2c.h>
- #include <linux/i2c-dev.h>
- 
- /*