X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/61bf0e31f374b8232aaaa5916479bda14cf4ee4b..8300ab10c481810ba6a39b5c418e26f91ae26acf:/package/uci/Makefile

diff --git a/package/uci/Makefile b/package/uci/Makefile
index 651215001..fadcbcd58 100644
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -1,24 +1,31 @@
-# 
-# Copyright (C) 2008 OpenWrt.org
+#
+# Copyright (C) 2008-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
+UCI_VERSION=2011-11-14
+UCI_RELEASE=1
+
 PKG_NAME:=uci
-PKG_VERSION:=0.1.2
+PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
 PKG_RELEASE:=1
+PKG_REV:=7289b2d69aaffa9299b47aaaa0da1e9969ace6c1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
-PKG_MD5SUM:=2c1bd1b24ca3c3e565b28122f2efd047
+PKG_SOURCE_URL:=git://nbd.name/uci.git
+PKG_SOURCE_SUBDIR:=uci-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_PROTO:=git
+PKG_MIRROR_MD5SUM:=74b0ab930321c4f85f220ff3852e210a
 
-LIBVERSION=0.1
+PKG_BUILD_PARALLEL:=0
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 # set to 1 to enable debugging
 DEBUG=
@@ -36,41 +43,46 @@ define Package/uci
   TITLE:=Utility for the Unified Configuration Interface (UCI)
 endef
 
-define Package/uci-sh
-  SECTION:=base
-  CATEGORY:=Base system
-  DEPENDS:=@!PACKAGE_uci
-  TITLE:=Old shell/awk implementation of UCI
+define Package/libuci-lua
+  SECTION=libs
+  CATEGORY=Libraries
+  DEPENDS:=+libuci +liblua
+  TITLE:=Lua plugin for UCI
 endef
 
-define Build/Configure
-endef
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		COPTS="$(TARGET_CFLAGS)" \
-		DEBUG="$(DEBUG)" \
-		VERSION="$(LIBVERSION)" \
-		OS="Linux"
-endef
+CMAKE_OPTIONS = \
+	-DLUAPATH=/usr/lib/lua \
+	$(if $(DEBUG),-DUCI_DEBUG=ON)
 
 define Package/libuci/install
 	$(INSTALL_DIR) $(1)/lib
 	$(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/lib/
 endef
 
+define Package/libuci-lua/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(CP) $(PKG_BUILD_DIR)/lua/uci.so $(1)/usr/lib/lua/
+endef
+
 define Package/uci/install
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci $(1)/sbin/
-	$(CP) ./files/uci/* $(1)/
+	$(CP) ./files/* $(1)/
 endef
 
-define Package/uci-sh/install
-	$(INSTALL_DIR) $(1)
-	$(CP) ./files/uci-sh/* $(1)/
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/uci{,_config,map}.h $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libuci.a $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib
 endef
 
 $(eval $(call BuildPackage,uci))
 $(eval $(call BuildPackage,libuci))
-$(eval $(call BuildPackage,uci-sh))
+$(eval $(call BuildPackage,libuci-lua))