aboutsummaryrefslogtreecommitdiffstats
path: root/package/libubox
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-08-11 22:09:11 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-08-11 22:09:11 +0000
commit4163894f0011cd4b0b6a27e617ace2c2caa8f2d4 (patch)
treee6c37b3ab5fb50c671c9c392dc6e964bd31a5f75 /package/libubox
parent6f64e87d8ad1486ff0dfea4908a88b1a9db6cc89 (diff)
downloadupstream-4163894f0011cd4b0b6a27e617ace2c2caa8f2d4.tar.gz
upstream-4163894f0011cd4b0b6a27e617ace2c2caa8f2d4.tar.bz2
upstream-4163894f0011cd4b0b6a27e617ace2c2caa8f2d4.zip
update libubox and ubus to latest, libubox now includes jshn
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27963 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libubox')
-rw-r--r--package/libubox/Makefile24
1 files changed, 20 insertions, 4 deletions
diff --git a/package/libubox/Makefile b/package/libubox/Makefile
index 621b05ed85..0b7f11b073 100644
--- a/package/libubox/Makefile
+++ b/package/libubox/Makefile
@@ -1,15 +1,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libubox
-PKG_VERSION:=2011-03-27
+PKG_VERSION:=2011-08-11
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:=89122a2c1e7f891c3ae2e8ed562d0df562d8a0f6
+PKG_SOURCE_VERSION:=d6ebb84ad66b16ae896a797bd865a23c80eff4e4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_MD5SUM:=5472edf27903eb4b606c88fa4d9a24b4
+PKG_MIRROR_MD5SUM:=86a81efd10cd0e05d45cd406bee196eb
CMAKE_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
@@ -22,7 +22,6 @@ define Package/libubox
DEPENDS:=
endef
-
define Package/libblobmsg-json
SECTION:=libs
CATEGORY:=Libraries
@@ -30,6 +29,16 @@ 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
@@ -43,6 +52,13 @@ define Package/libblobmsg-json/install
$(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))