uci: update to latest version, adds uci<->blobmsg conversion code from netifd

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36908

diff --git a/package/uci/Makefile b/package/uci/Makefile
index bdd9ab3880028a7711594bc138e0b7c946f9a113..2dbd0eecd0f8defac5b27b1ed24a69ff2f80aed8 100644 (file)
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -7,20 +7,19 @@
 
 include $(TOPDIR)/rules.mk
 
 
 include $(TOPDIR)/rules.mk
 

-UCI_VERSION=2013-05-26
+UCI_VERSION=2013-06-10

 UCI_RELEASE=1
 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
 PKG_RELEASE:=1
 UCI_RELEASE=1
 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
 PKG_RELEASE:=1

-PKG_REV:=9ef6964362f917ba035020d439d05b36abfe5bb9
+PKG_REV:=9d8e1fe4857c1c3e8f1a2e2ae59ef9c4790adb39

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=git://nbd.name/uci.git
 PKG_SOURCE_SUBDIR:=uci-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=git://nbd.name/uci.git
 PKG_SOURCE_SUBDIR:=uci-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=git

-PKG_MIRROR_MD5SUM:=05585c577ae39173920d0a44bda9537a

 
 PKG_LICENSE:=LGPLv2.1 GPLv2
 PKG_LICENSE_FILES:=
 
 PKG_LICENSE:=LGPLv2.1 GPLv2
 PKG_LICENSE_FILES:=


@@ -39,6 +38,7 @@ define Package/libuci
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=C library for the Unified Configuration Interface (UCI)
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=C library for the Unified Configuration Interface (UCI)

+  DEPENDS:=+libubox

 endef
 
 define Package/uci
 endef
 
 define Package/uci


@@ -81,7 +81,7 @@ endef
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include

-       $(CP) $(PKG_BUILD_DIR)/uci{,_config,map}.h $(1)/usr/include
+       $(CP) $(PKG_BUILD_DIR)/uci{,_config,_blob,map}.h $(1)/usr/include

        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib