add ssize_t definition to site files, fix up size for x86_64

[openwrt.git] / package / uci / Makefile

diff --git a/package/uci/Makefile b/package/uci/Makefile
index 5ace904..c24ce04 100644 (file)
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -8,8 +8,8 @@
 
 include $(TOPDIR)/rules.mk
 
 
 include $(TOPDIR)/rules.mk
 

-UCI_VERSION=0.3
-UCI_RELEASE=3
+UCI_VERSION=0.4
+UCI_RELEASE=8

 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
 
 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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources

-PKG_MD5SUM:=e1d3204629938adb21c6bf84a08ce001
+PKG_MD5SUM:=1a671895bfaafe86087ce4374dfb8556

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -37,13 +37,6 @@ define Package/uci
   TITLE:=Utility for the Unified Configuration Interface (UCI)
 endef
 
   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
 define Package/libuci-lua
   SECTION=libs
   CATEGORY=Libraries


@@ -54,6 +47,7 @@ endef
 define Build/Configure
 endef
 
 define Build/Configure
 endef
 

+TARGET_CFLAGS += $(FPIC)

 UCI_MAKEOPTS = \
                $(TARGET_CONFIGURE_OPTS) \
                COPTS="$(TARGET_CFLAGS)" \
 UCI_MAKEOPTS = \
                $(TARGET_CONFIGURE_OPTS) \
                COPTS="$(TARGET_CFLAGS)" \


@@ -73,19 +67,15 @@ define Package/libuci/install
 endef
 
 define Package/libuci-lua/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
 endef
 
 define Package/uci/install

+       $(INSTALL_DIR) $(1)/etc/uci-defaults

        $(INSTALL_DIR) $(1)/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/uci $(1)/sbin/
        $(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
 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))
 $(eval $(call BuildPackage,libuci))
 $(eval $(call BuildPackage,libuci-lua))

-$(eval $(call BuildPackage,uci-sh))