From 5e4563221a3af6ee81a0746e4e002f9607c8bec2 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 11 Aug 2011 22:09:11 +0000 Subject: update libubox and ubus to latest, libubox now includes jshn SVN-Revision: 27963 --- package/libubox/Makefile | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'package/libubox/Makefile') diff --git a/package/libubox/Makefile b/package/libubox/Makefile index 621b05e..0b7f11b 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)) -- cgit v1.1