X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fubus%2FMakefile;h=abd0a7653b471ea73a6e4563a8d6ec8c45410cd8;hb=801985e5286881dd578a19280b2a6c8e212a530d;hp=412e6b05c3a7f803cbbda4812e1a099fcea5c66c;hpb=96fee377d5d0e05ad7841b617cc012c304af0eea;p=openwrt.git

diff --git a/package/ubus/Makefile b/package/ubus/Makefile
index 412e6b05c3..abd0a7653b 100644
--- 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:=2013-05-30
 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:=f72dca720bb50d45b1b01bab5b01cb80c78c5230
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_MD5SUM:=64075ed5e0d1b6f1b002fbb0943069e5
+PKG_MIRROR_MD5SUM:=
 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))