X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3dd1e793874ea5a310ecd293bc2b2058e0a48288..ddc9278d09957a5c6cb27ad0ca696f096476e38a:/package/uci/Makefile?ds=inline diff --git a/package/uci/Makefile b/package/uci/Makefile index 485ba5ae3..bd46864bc 100644 --- a/package/uci/Makefile +++ b/package/uci/Makefile @@ -4,20 +4,22 @@ # 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_RELEASE=0 +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:=da0f3dbe5f21fc757133a47836408c71 +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 @@ -37,17 +39,17 @@ 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 @@ -59,12 +61,15 @@ UCI_MAKEOPTS = \ COPTS="$(TARGET_CFLAGS)" \ DEBUG="$(DEBUG)" \ VERSION="$(UCI_VERSION)" \ - CPPFLAGS="-I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \ + CPPFLAGS="-I$(PKG_BUILD_DIR) $(TARGET_CPPFLAGS)" \ + FPIC="$(FPIC)" \ OS="Linux" 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 @@ -73,29 +78,34 @@ define Package/libuci/install 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 + $(INSTALL_DIR) $(1)/usr/lib/lua + $(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))