# 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.7
-UCI_RELEASE=4
+UCI_VERSION=2011-01-19
+UCI_RELEASE=1
PKG_NAME:=uci
PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
PKG_RELEASE:=1
+PKG_REV:=a5eb996e0f04d911ff61479508bbc3e17b16ff0c
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
-PKG_MD5SUM:=39e46c24651e7e5c1759f3223bd299f9
+PKG_SOURCE_URL:=git://nbd.name/uci.git
+PKG_SOURCE_SUBDIR:=uci-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_PROTO:=git
include $(INCLUDE_DIR)/package.mk
TITLE:=Utility for the Unified Configuration Interface (UCI)
endef
+define Package/ucitrigger
+ SECTION:=base
+ CATEGORY:=Base system
+ 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 += $(FPIC)
UCI_MAKEOPTS = \
$(TARGET_CONFIGURE_OPTS) \
COPTS="$(TARGET_CFLAGS)" \
DEBUG="$(DEBUG)" \
VERSION="$(UCI_VERSION)" \
CPPFLAGS="-I$(PKG_BUILD_DIR) $(TARGET_CPPFLAGS)" \
+ FPIC="$(FPIC)" \
OS="Linux"
-# work around a nasty gcc bug
-ifneq ($(CONFIG_GCC_VERSION_4_2_4),)
- UCI_MAKEOPTS += WOPTS=""
-endif
-
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) $(UCI_MAKEOPTS)
$(MAKE) -C $(PKG_BUILD_DIR)/lua $(UCI_MAKEOPTS)
+ $(MAKE) -C $(PKG_BUILD_DIR)/trigger $(UCI_MAKEOPTS) \
+ LIBS="$(TARGET_LDFLAGS) -L$(PKG_BUILD_DIR) -luci -llua -lcrypt -lm"
endef
define Package/libuci/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
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
- $(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib
endef
$(eval $(call BuildPackage,uci))
$(eval $(call BuildPackage,libuci))
$(eval $(call BuildPackage,libuci-lua))
+$(eval $(call BuildPackage,ucitrigger))