ubus: update to latest version, fixes request timeout handling issues, hangs on lots...

[openwrt/openwrt.git] / package / ubus / Makefile

diff --git a/package/ubus/Makefile b/package/ubus/Makefile
index 412e6b05c3a7f803cbbda4812e1a099fcea5c66c..617c76749b1d742047807b769ea0c8a43405dbd0 100644 (file)
--- a/package/ubus/Makefile
+++ b/package/ubus/Makefile
@@ -1,17 +1,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ubus
-PKG_VERSION:=2011-03-27
+PKG_VERSION:=2012-12-15
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/luci2/ubus.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=e49b34f91267449e89d3f482b7c16bbf84bf90fd
+PKG_SOURCE_VERSION:=bb856ad8a9a1e786494d01e34bbfe2b4d2134021
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_MD5SUM:=64075ed5e0d1b6f1b002fbb0943069e5
+PKG_MIRROR_MD5SUM:=fe419893677d12e6455bbe5e3b503944
 CMAKE_INSTALL:=1
 
+PKG_LICENSE:=LGPLv2.1
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -28,6 +33,7 @@ define Package/ubusd
   CATEGORY:=LuCI2
   SUBMENU:=System
   TITLE:=OpenWrt RPC daemon
+  DEPENDS:=+libubox
 endef
 
 define Package/libubus
@@ -38,15 +44,27 @@ define Package/libubus
   TITLE:=OpenWrt RPC client library
 endef
 
+define Package/libubus-lua
+  SECTION:=luci2
+  CATEGORY:=LuCI2
+  SUBMENU:=Libraries
+  DEPENDS:=+libubus +liblua
+  TITLE:=Lua binding for the OpenWrt RPC client
+endef
+
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
 
+CMAKE_OPTIONS = \
+       -DLUAPATH=/usr/lib/lua
+
 define Package/ubus/install
        $(INSTALL_DIR) $(1)/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/ubus $(1)/bin/
 endef
 
 define Package/ubusd/install
-       $(INSTALL_DIR) $(1)/sbin
+       $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/ubus.init $(1)/etc/init.d/ubus
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ubusd $(1)/sbin/
 endef
 
@@ -55,7 +73,13 @@ define Package/libubus/install
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/lib/
 endef
 
+define Package/libubus-lua/install
+       $(INSTALL_DIR) $(1)/usr/lib/lua
+       $(CP) $(PKG_BUILD_DIR)/lua/ubus.so $(1)/usr/lib/lua/
+endef
+
 $(eval $(call BuildPackage,ubus))
 $(eval $(call BuildPackage,ubusd))
 $(eval $(call BuildPackage,libubus))
+$(eval $(call BuildPackage,libubus-lua))