aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-04-13 14:34:42 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-04-13 14:34:42 +0000
commite3ec9ee18c7fcf3e3a800b7d3a2c95466af74123 (patch)
treee1f19e32d85382d8199c6af15061192a5c90c1a9
parent412e35b421aa090ad562030e580226fc25ae2411 (diff)
downloadupstream-e3ec9ee18c7fcf3e3a800b7d3a2c95466af74123.tar.gz
upstream-e3ec9ee18c7fcf3e3a800b7d3a2c95466af74123.tar.bz2
upstream-e3ec9ee18c7fcf3e3a800b7d3a2c95466af74123.zip
upgrade uci to 0.3.3, build lua plugin
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10818 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/uci/Makefile26
1 files changed, 21 insertions, 5 deletions
diff --git a/package/uci/Makefile b/package/uci/Makefile
index 4c07edf3b3..5ace904649 100644
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -9,7 +9,7 @@
include $(TOPDIR)/rules.mk
UCI_VERSION=0.3
-UCI_RELEASE=1
+UCI_RELEASE=3
PKG_NAME:=uci
PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
@@ -17,8 +17,7 @@ PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
-PKG_MD5SUM:=d1c7a1980b25f13f3c415b246051c758
-
+PKG_MD5SUM:=e1d3204629938adb21c6bf84a08ce001
include $(INCLUDE_DIR)/package.mk
@@ -45,16 +44,27 @@ define Package/uci-sh
TITLE:=Old shell/awk implementation of UCI
endef
+define Package/libuci-lua
+ SECTION=libs
+ CATEGORY=Libraries
+ DEPENDS:=+libuci +lua
+ TITLE:=Lua plugin for UCI
+endef
+
define Build/Configure
endef
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
+UCI_MAKEOPTS = \
$(TARGET_CONFIGURE_OPTS) \
COPTS="$(TARGET_CFLAGS)" \
DEBUG="$(DEBUG)" \
VERSION="$(UCI_VERSION)" \
+ CPPFLAGS="-I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \
OS="Linux"
+
+define Build/Compile
+ $(MAKE) -C $(PKG_BUILD_DIR) $(UCI_MAKEOPTS)
+ $(MAKE) -C $(PKG_BUILD_DIR)/lua $(UCI_MAKEOPTS)
endef
define Package/libuci/install
@@ -62,6 +72,11 @@ define Package/libuci/install
$(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/lib/
endef
+define Package/libuci-lua/install
+ $(INSTALL_DIR) $(1)/usr/lib/lua/5.1
+ $(CP) $(PKG_BUILD_DIR)/lua/uci.so $(1)/usr/lib/lua/5.1
+endef
+
define Package/uci/install
$(INSTALL_DIR) $(1)/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci $(1)/sbin/
@@ -82,4 +97,5 @@ endef
$(eval $(call BuildPackage,uci))
$(eval $(call BuildPackage,libuci))
+$(eval $(call BuildPackage,libuci-lua))
$(eval $(call BuildPackage,uci-sh))