ubus: update to the latest version, adds a race fix for wait_for

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

diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile
index abd0a7653b471ea73a6e4563a8d6ec8c45410cd8..b2352f4f098399bfd25e052808fbc343230e44ce 100644 (file)
--- a/package/system/ubus/Makefile
+++ b/package/system/ubus/Makefile
@@ -1,53 +1,50 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ubus
-PKG_VERSION:=2013-05-30
+PKG_VERSION:=2016-10-12
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://nbd.name/luci2/ubus.git
+PKG_SOURCE_URL=$(LEDE_GIT)/project/ubus.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f72dca720bb50d45b1b01bab5b01cb80c78c5230
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_MD5SUM:=
+PKG_SOURCE_VERSION:=312448a5b147c221836827a7a641e76a4514db44
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_MD5SUM:=0d572863d46c9d6e89a573ed5db671f4eaff311df6fa5e8fa83b8f07e7dc928d
 CMAKE_INSTALL:=1
 
-PKG_LICENSE:=LGPLv2.1
+PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/ubus
-  SECTION:=luci2
-  CATEGORY:=LuCI2
-  SUBMENU:=System
+  SECTION:=base
+  CATEGORY:=Base system
   DEPENDS:=+libubus +libblobmsg-json +ubusd
   TITLE:=OpenWrt RPC client utility
 endef
 
 define Package/ubusd
-  SECTION:=luci2
-  CATEGORY:=LuCI2
-  SUBMENU:=System
+  SECTION:=base
+  CATEGORY:=Base system
   TITLE:=OpenWrt RPC daemon
-  DEPENDS:=+libubox
+  DEPENDS:=+libubox +libblobmsg-json
 endef
 
 define Package/libubus
-  SECTION:=luci2
-  CATEGORY:=LuCI2
-  SUBMENU:=Libraries
+  SECTION:=libs
+  CATEGORY:=Libraries
   DEPENDS:=+libubox
+  ABI_VERSION:=$(PKG_VERSION)
   TITLE:=OpenWrt RPC client library
 endef
 
 define Package/libubus-lua
-  SECTION:=luci2
-  CATEGORY:=LuCI2
-  SUBMENU:=Libraries
+  SECTION:=libs
+  CATEGORY:=Libraries
   DEPENDS:=+libubus +liblua
   TITLE:=Lua binding for the OpenWrt RPC client
 endef
@@ -69,7 +66,7 @@ endef
 
 define Package/libubus/install
        $(INSTALL_DIR) $(1)/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/lib/
 endef
 
 define Package/libubus-lua/install
@@ -77,8 +74,7 @@ define Package/libubus-lua/install
        $(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))
-
+$(eval $(call BuildPackage,ubus))
+$(eval $(call BuildPackage,ubusd))