X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/38df04989f5f979596bcceee9d66e68b699b5188..502d6255c81bbbfa76c6fc153d2c57351ee85d32:/package/uci/Makefile?ds=sidebyside diff --git a/package/uci/Makefile b/package/uci/Makefile index 78b3fa8e3..fadcbcd58 100644 --- a/package/uci/Makefile +++ b/package/uci/Makefile @@ -1,5 +1,5 @@ # -# 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. @@ -7,21 +7,25 @@ include $(TOPDIR)/rules.mk -UCI_VERSION=2011-01-19 +UCI_VERSION=2011-11-14 UCI_RELEASE=1 PKG_NAME:=uci PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE)) PKG_RELEASE:=1 -PKG_REV:=a5eb996e0f04d911ff61479508bbc3e17b16ff0c +PKG_REV:=7289b2d69aaffa9299b47aaaa0da1e9969ace6c1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 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 + +PKG_BUILD_PARALLEL:=0 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk # set to 1 to enable debugging DEBUG= @@ -39,13 +43,6 @@ define Package/uci 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 @@ -53,29 +50,12 @@ define Package/libuci-lua 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) $(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 +CMAKE_OPTIONS = \ + -DLUAPATH=/usr/lib/lua \ + $(if $(DEBUG),-DUCI_DEBUG=ON) define Package/libuci/install $(INSTALL_DIR) $(1)/lib @@ -87,14 +67,6 @@ 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 @@ -108,9 +80,9 @@ define Build/InstallDev $(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))