adds more sanity checks to uci firewall

[openwrt.git] / package / uci / Makefile

diff --git a/package/uci/Makefile b/package/uci/Makefile
index 485ba5a..3450bc6 100644 (file)
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -8,7 +8,7 @@
 
 include $(TOPDIR)/rules.mk
 
-UCI_VERSION=0.4
+UCI_VERSION=0.6
 UCI_RELEASE=0
 
 PKG_NAME:=uci
@@ -17,7 +17,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
-PKG_MD5SUM:=da0f3dbe5f21fc757133a47836408c71
+PKG_MD5SUM:=7ac5afec87e44559bbcfc1c2a76edf51
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -37,13 +37,6 @@ 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
-endef
-
 define Package/libuci-lua
   SECTION=libs
   CATEGORY=Libraries
@@ -54,6 +47,7 @@ endef
 define Build/Configure
 endef
 
+TARGET_CFLAGS += $(FPIC)
 UCI_MAKEOPTS = \
                $(TARGET_CONFIGURE_OPTS) \
                COPTS="$(TARGET_CFLAGS)" \
@@ -73,19 +67,15 @@ 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/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
@@ -98,4 +88,3 @@ endef
 $(eval $(call BuildPackage,uci))
 $(eval $(call BuildPackage,libuci))
 $(eval $(call BuildPackage,libuci-lua))
-$(eval $(call BuildPackage,uci-sh))