uci: update to latest version, uses cmake now

[openwrt.git] / package / uci / Makefile

diff --git a/package/uci/Makefile b/package/uci/Makefile
index 4b77baa..ffd37a7 100644 (file)
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -4,22 +4,26 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
-UCI_VERSION=0.4
+UCI_VERSION=2011-03-26
 UCI_RELEASE=1
 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
 PKG_RELEASE:=1
+PKG_REV:=0e8c97eef4aa154543c539b13b5e16859cec8a25
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
-PKG_MD5SUM:=381b5da987b206b3ab5d666785fbb833
+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:=d5329ee38167608bfe2d6f758d9250d0
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 # set to 1 to enable debugging
 DEBUG=
@@ -37,35 +41,26 @@ define Package/uci
   TITLE:=Utility for the Unified Configuration Interface (UCI)
 endef
 
-define Package/uci-sh
+define Package/ucitrigger
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=@!PACKAGE_uci
-  TITLE:=Old shell/awk implementation of UCI
+  DEPENDS:=+libuci-lua +lua
+  TITLE:=Automatic triggers for applying system config changes
 endef
 
 define Package/libuci-lua
   SECTION=libs
   CATEGORY=Libraries
-  DEPENDS:=+libuci +lua
+  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
 
-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
+CMAKE_OPTIONS = \
+       -DLUAPATH=/usr/lib/lua \
+       $(if $(DEBUG),-DUCI_DEBUG=ON)
 
 define Package/libuci/install
        $(INSTALL_DIR) $(1)/lib
@@ -77,25 +72,30 @@ define Package/libuci-lua/install
        $(CP) $(PKG_BUILD_DIR)/lua/uci.so $(1)/usr/lib/lua/
 endef
 
+define Package/ucitrigger/install
+       $(INSTALL_DIR) $(1)/usr/lib/lua/uci $(1)/lib/config/trigger $(1)/usr/sbin
+       $(INSTALL_DATA) ./trigger/lib/trigger.lua $(1)/usr/lib/lua/uci/
+       $(INSTALL_DATA) ./trigger/modules/*.lua $(1)/lib/config/trigger/
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/trigger/uci_trigger.so $(1)/usr/lib/
+       $(INSTALL_BIN) ./trigger/apply_config $(1)/usr/sbin/
+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)/
-endef
-
-define Package/uci-sh/install
-       $(INSTALL_DIR) $(1)
-       $(CP) ./files/uci-sh/* $(1)/
+       $(CP) ./files/* $(1)/
 endef
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
-       $(CP) $(PKG_BUILD_DIR)/uci{,_config}.h $(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
 endef
 
 $(eval $(call BuildPackage,uci))
 $(eval $(call BuildPackage,libuci))
 $(eval $(call BuildPackage,libuci-lua))
-$(eval $(call BuildPackage,uci-sh))
+$(eval $(call BuildPackage,ucitrigger))