ubus: update to latest version, fixes a socket race condition in the client library...

[openwrt/svn-archive/archive.git] / package / ubus / Makefile

diff --git a/package/ubus/Makefile b/package/ubus/Makefile
index c117453cb5b0b4ce8393d768cd2cda30115de646..6db74183182418a72da52a04100996ef876c07a9 100644 (file)
--- a/package/ubus/Makefile
+++ b/package/ubus/Makefile
@@ -1,15 +1,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ubus
-PKG_VERSION:=2011-10-10
+PKG_VERSION:=2012-05-18
 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:=1ad3493658fe3a3782e51efe960c07549f117a28
+PKG_SOURCE_VERSION:=c0c06ec7ead11ca201bcbf0d1c7e986c7d3c90c0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_MD5SUM:=e52e88902b3a065c168d1dbeeac5b4ce
+PKG_MIRROR_MD5SUM:=b16d3a0c6e7ca55666dbd786ccadbbcf
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -38,15 +38,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 +67,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))