X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Flibubox%2FMakefile;h=f524041f2021496a640c57b5d22b15bbe82e8839;hb=eef559bf3f1042dbefe0a88341f73d78f9f26c60;hp=a2b3a9c51a5721f289de93ab76ed70a28c8c60d3;hpb=1471a12676da0bf056a8563af29d144c2f4ba990;p=openwrt.git

diff --git a/package/libubox/Makefile b/package/libubox/Makefile
index a2b3a9c51a..f524041f20 100644
--- a/package/libubox/Makefile
+++ b/package/libubox/Makefile
@@ -1,14 +1,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libubox
-PKG_VERSION:=2010-02-07
-PKG_RELEASE:=1
+PKG_VERSION:=2012-07-07
+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:=e44dbfb1029829dbd6c5e1ca11e461d9a89027b9
+PKG_SOURCE_VERSION:=0001d8ab26694f5f546da7e8f9d0575b49671500
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_MD5SUM:=b0cc247beab2f5b257c846d651afa37f
 CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -18,24 +19,46 @@ define Package/libubox
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Basic utility library
-  DEPENDS:=+libjson
+  DEPENDS:=
 endef
 
-
 define Package/libblobmsg-json
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=blobmsg <-> json conversion library
+  DEPENDS:=+libjson +libubox
+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))