diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /package/uci | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'package/uci')
| -rw-r--r-- | package/uci/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/package/uci/Makefile b/package/uci/Makefile index 39741a301..9b020f671 100644 --- a/package/uci/Makefile +++ b/package/uci/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2011 OpenWrt.org +# Copyright (C) 2008-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,20 +7,20 @@ include $(TOPDIR)/rules.mk -UCI_VERSION=2012-03-28 +UCI_VERSION=2013-05-02 UCI_RELEASE=1 PKG_NAME:=uci PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE)) PKG_RELEASE:=1 -PKG_REV:=af2665866061c63ba63335b43aa6ff5102d4e492 +PKG_REV:=b42ee8f21842fab41a4cdf27960000bb1b3f42a7 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:=0ee76d8f79cf99f5539fd090a4e65646 +PKG_MIRROR_MD5SUM:=39a07950eaaa4548a5a2bba3b62df788 PKG_LICENSE:=LGPLv2.1 GPLv2 PKG_LICENSE_FILES:= @@ -84,7 +84,6 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/uci{,_config,map}.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 |