aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-05-06 08:27:40 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-05-06 08:27:40 +0000
commit9dec26a0ec29a8160d43f4b5e5c414651ac02ce2 (patch)
treeac1291c379cd3e6b2fb49227b7b8379ec903eb8d
parentff33988d74030e27e6cfcabae750586e7894db6c (diff)
downloadmaster-187ad058-9dec26a0ec29a8160d43f4b5e5c414651ac02ce2.tar.gz
master-187ad058-9dec26a0ec29a8160d43f4b5e5c414651ac02ce2.tar.bz2
master-187ad058-9dec26a0ec29a8160d43f4b5e5c414651ac02ce2.zip
ubus: update to latest version, add LUAPATH to cmake options - fixes #11398
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31622 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/ubus/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/package/ubus/Makefile b/package/ubus/Makefile
index 6bef8fed12..216fdc3f89 100644
--- a/package/ubus/Makefile
+++ b/package/ubus/Makefile
@@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ubus
-PKG_VERSION:=2012-05-05
+PKG_VERSION:=2012-05-06
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/luci2/ubus.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=25b9b4b827f74482743689386b195dca3b81a0df
+PKG_SOURCE_VERSION:=a204ae358be1d5e0bb3a56bd54980851f553588e
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MIRROR_MD5SUM:=d68885340ab1cee2e04e9055186beb11
CMAKE_INSTALL:=1
@@ -48,6 +48,9 @@ endef
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+CMAKE_OPTIONS = \
+ -DLUAPATH=/usr/lib/lua
+
define Package/ubus/install
$(INSTALL_DIR) $(1)/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/ubus $(1)/bin/