ubus: update to latest version, fixes a crash on reconnect

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

diff --git a/package/ubus/Makefile b/package/ubus/Makefile
index 51a25d801087199851e984191407cc02cfac33c1..ef1864aaf7d47dfb817077436062e293fffbca8f 100644 (file)
--- a/package/ubus/Makefile
+++ b/package/ubus/Makefile
@@ -1,17 +1,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ubus
-PKG_VERSION:=2011-07-30
+PKG_VERSION:=2013-04-04
 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:=52ce4320ed44d8ca1aed61b1eae4bb651082679a
+PKG_SOURCE_VERSION:=90037b772c525ad734acb4641c9dacb7abf48ffe
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_MD5SUM:=8f31d931d8f95036d07afb7f885d32e3
+PKG_MIRROR_MD5SUM:=9d7fece38790add2c3d0f61a0aca2628
 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,8 +44,19 @@ 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/
@@ -55,7 +72,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))