upgrade uci to 0.3.3, build lua plugin

SVN-Revision: 10818

diff --git a/package/uci/Makefile b/package/uci/Makefile
index 4c07edf3b3a0d1b687223b1fa81effea53958dbb..5ace9046491daae1846e8d9177ef63b7d5173333 100644 (file)
--- 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))