Merge pull request #282 from ecsv/batadv-2017.0

batman-adv 2017.0

diff --git a/MAINTAINERS b/MAINTAINERS
index 18923279e14f8fd2162a2c0c5f8fce6f068f5529..7eadf8e4757027f456e0544d63eedc576d5c1eea 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9,7 +9,7 @@
 
 Axel "axn" Neumann <neumann@cgws.de>
 Baptiste Jonglez <openwrt-pkg@bitsofnetworks.org>
-Bastian Bittorf <bittorf@bluebottle.com>
+Bastian Bittorf <bb@npl.de>
 Corinna "Elektra" Aichele <onelektra@gmx.net>
 Gabriel Kerneis <gabriel@kerneis.info>
 Gui Iribarren <gui@altermundi.net>
@@ -21,5 +21,5 @@ Nicolás Echániz <nicoechaniz@altermundi.net>
 Pau Escrich <pau@dabax.net>
 Saverio Proto <zioproto@gmail.com>
 Simon Wunderlich <sw@simonwunderlich.de>
-Steven Barth <cyrus@openwrt.org>
+Steven Barth <steven@midlink.org>
 Vasilis "acinonyx" Tsiligiannis <acinonyx@openwrt.gr>

diff --git a/poprouting/Makefile b/poprouting/Makefile
index 6a889057ba3ae0f9516d43173cb7e777e3504ac4..0f51a8b1866e3a800e878d2ccb605539ad63c207 100644 (file)
--- a/poprouting/Makefile
+++ b/poprouting/Makefile
@@ -1,16 +1,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=prince
-PKG_VERSION:=v0.2
-PKG_RELEASE:=2
+PKG_VERSION:=v0.3.1
+PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/prince-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_USE_MIPS16:=0
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=prince-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/gabri94/poprouting.git
-PKG_SOURCE_VERSION:=v0.2
-PKG_SOURCE_SUBDIR:=prince-v0.2
+PKG_SOURCE_VERSION:=v0.3.1
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 include $(INCLUDE_DIR)/package.mk
 
 define Package/prince
@@ -36,10 +36,9 @@ endef
 
 define Package/prince/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/graph-parser_c/build/lib/libgraphcparser.so $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/prince/build/prince_c $(1)/usr/sbin/
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/prince/build/libprince_oonf.so $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/output/prince $(1)/usr/sbin/
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/output/libprince_oonf_c.so $(1)/usr/lib/
 endef