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/ubus | |
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/ubus')
-rw-r--r-- | package/ubus/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/package/ubus/Makefile b/package/ubus/Makefile index 12280e92f..cb173961a 100644 --- a/package/ubus/Makefile +++ b/package/ubus/Makefile @@ -1,15 +1,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ubus -PKG_VERSION:=2012-06-01 +PKG_VERSION:=2013-05-11 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://nbd.name/luci2/ubus.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=a62e2f8c15a65efb1a82404d8f31e3bfc1cbe7d9 +PKG_SOURCE_VERSION:=dd3afa517d4fefaadee9fcefefd2e503e251e909 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_MD5SUM:=cbca78919d44bcf0f8d1e09743131e6d +PKG_MIRROR_MD5SUM:=a02ca473dcd490691b4cd514705c773d CMAKE_INSTALL:=1 PKG_LICENSE:=LGPLv2.1 @@ -63,8 +63,7 @@ define Package/ubus/install endef define Package/ubusd/install - $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d - $(INSTALL_BIN) ./files/ubus.init $(1)/etc/init.d/ubus + $(INSTALL_DIR) $(1)/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ubusd $(1)/sbin/ endef |