diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /package/libs/libubox/Makefile | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'package/libs/libubox/Makefile')
| -rw-r--r-- | package/libs/libubox/Makefile | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index a3291692e..9865dc2be 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -1,18 +1,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libubox -PKG_VERSION:=2012-12-02 +PKG_VERSION:=2013-04-15 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:=9d8f2dd47b27d372c319ef7e334feb2b47cfa5f9 +PKG_SOURCE_VERSION:=dcf93f332270bdaddb5d24fdba6e3eb5b1f7d80a PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_MD5SUM:=8eb9929fc74397ac199a012791d51b3a +PKG_MIRROR_MD5SUM:= CMAKE_INSTALL:=1 -PKG_LICENSE:=GPLv2 +PKG_LICENSE:=ISC BSD-3c PKG_LICENSE_FILES:= PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org> @@ -47,6 +47,13 @@ define Package/jshn/description Library for parsing and generating JSON from shell scripts endef +define Package/libjson-script + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=+libubox + TITLE:=Minimalistic JSON based scripting engine +endef + TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include CMAKE_OPTIONS = \ -DLUAPATH=/usr/lib/lua @@ -67,7 +74,12 @@ define Package/jshn/install $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libubox/jshn.sh $(1)/usr/share/libubox endef +define Package/libjson-script/install + $(INSTALL_DIR) $(1)/lib/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjson_script.so $(1)/lib/ +endef + $(eval $(call BuildPackage,libubox)) $(eval $(call BuildPackage,libblobmsg-json)) $(eval $(call BuildPackage,jshn)) - +$(eval $(call BuildPackage,libjson-script)) |