X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Flibubox%2FMakefile;h=0fae4cbef2cee2b4c007f119d844b876b17eebcd;hb=b444904744b4e41861c6215f398cfee7637f2baf;hp=684ffca1f6d18509ca49cbfd57b9503a8f4817de;hpb=344688637922aa2e8f1cab8173eb0967c83b6bd1;p=openwrt.git

diff --git a/package/libubox/Makefile b/package/libubox/Makefile
index 684ffca1f6..0fae4cbef2 100644
--- a/package/libubox/Makefile
+++ b/package/libubox/Makefile
@@ -1,14 +1,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libubox
-PKG_VERSION:=2011-02-11
-PKG_RELEASE:=1
+PKG_VERSION:=2012-05-30
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/luci2/libubox.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=83037e345dd702f2a013322139ef0b7bab7e170f
+PKG_SOURCE_VERSION:=0608d1299546d4af1facc271a090cb2abb8c6105
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_MD5SUM:=6a08dfa2519a969d184e7bb5bb390620
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -18,10 +19,9 @@ define Package/libubox
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Basic utility library
-  DEPENDS:=+libjson
+  DEPENDS:=
 endef
 
-
 define Package/libblobmsg-json
   SECTION:=libs
   CATEGORY:=Libraries
@@ -29,13 +29,36 @@ define Package/libblobmsg-json
   DEPENDS:=+libjson
 endef
 
+define Package/jshn
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libjson
+  TITLE:=JSON SHell Notation
+endef
+
+define Package/jshn/description
+  Library for parsing and generating JSON from shell scripts
+endef
 
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
 
 define Package/libubox/install
 	$(INSTALL_DIR) $(1)/lib/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libubox.so $(1)/lib/
+endef
+
+define Package/libblobmsg-json/install
+	$(INSTALL_DIR) $(1)/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblobmsg_json.so $(1)/lib/
+endef
+
+define Package/jshn/install
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share/libubox
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jshn $(1)/usr/bin
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libubox/jshn.sh $(1)/usr/share/libubox
 endef
 
 $(eval $(call BuildPackage,libubox))
+$(eval $(call BuildPackage,libblobmsg-json))
+$(eval $(call BuildPackage,jshn))