[brcm63xx] make bcm6358 consistend with the other boards naming

[openwrt.git] / package / uci / Makefile

diff --git a/package/uci/Makefile b/package/uci/Makefile
index 4c07edf..6d1f7d9 100644 (file)
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -8,8 +8,8 @@
 
 include $(TOPDIR)/rules.mk
 
-UCI_VERSION=0.3
-UCI_RELEASE=1
+UCI_VERSION=0.7
+UCI_RELEASE=3
 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
@@ -17,8 +17,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
-PKG_MD5SUM:=d1c7a1980b25f13f3c415b246051c758
-
+PKG_MD5SUM:=b8c033e7b08bb39e87ef00bdb779f0ba
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -38,23 +37,33 @@ 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 +lua
+  TITLE:=Lua plugin for UCI
 endef
 
 define Build/Configure
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+TARGET_CFLAGS += $(FPIC)
+UCI_MAKEOPTS = \
                $(TARGET_CONFIGURE_OPTS) \
                COPTS="$(TARGET_CFLAGS)" \
                DEBUG="$(DEBUG)" \
                VERSION="$(UCI_VERSION)" \
+               CPPFLAGS="-I$(PKG_BUILD_DIR) $(TARGET_CPPFLAGS)" \
                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)
 endef
 
 define Package/libuci/install
@@ -62,15 +71,16 @@ define Package/libuci/install
        $(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)/
-endef
-
-define Package/uci-sh/install
-       $(INSTALL_DIR) $(1)
-       $(CP) ./files/uci-sh/* $(1)/
+       $(CP) ./files/* $(1)/
 endef
 
 define Build/InstallDev
@@ -78,8 +88,10 @@ define Build/InstallDev
        $(CP) $(PKG_BUILD_DIR)/uci{,_config}.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))