X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fuci%2FMakefile;h=c24ce04ed7f47c79383fb2e69fd6a13087d0b327;hb=78202d191b1e0332bd03740e83a3e8c07819810d;hp=babc248db882c7b0c9c06ee5b72d02754fa37825;hpb=b146590a260e8494fade1348e0346556686bdff9;p=openwrt-10.03%2F.git

diff --git a/package/uci/Makefile b/package/uci/Makefile
index babc248db..c24ce04ed 100644
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 UCI_VERSION=0.4
-UCI_RELEASE=0
+UCI_RELEASE=8
 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
@@ -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:=1a671895bfaafe86087ce4374dfb8556
 
 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)" \
@@ -78,14 +72,10 @@ define Package/libuci-lua/install
 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))