X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=olsrd%2FMakefile;h=aa5de7a8d7e907c2ec5493cb6ba23349c99cfe99;hb=54e47597d78937ed14440eddb5cb49555c5f9304;hp=16cf47446c58f86158dd7a6de4f9cdb4a7b59653;hpb=4f8207064a7d668f7b1a80a25973654fa7761dc0;p=feed%2Frouting.git diff --git a/olsrd/Makefile b/olsrd/Makefile index 16cf474..aa5de7a 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2012 OpenWrt.org +# Copyright (C) 2009-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,17 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd -PKG_VERSION:=0.9.0.3 +PKG_VERSION:=0.9.6 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=http://olsr.org/git/olsrd.git +PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=v0.9.0.3 +PKG_SOURCE_VERSION:=v0.9.6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_MD5SUM:= -PKG_BUILD_PARALLEL:=1 +PKG_BUILD_PARALLEL:=0 PKG_LICENSE:=BSD-3-Clause include $(INCLUDE_DIR)/package.mk @@ -87,6 +87,12 @@ define Package/olsrd-mod-jsoninfo TITLE:=Small informative plugin with JSON output endef +define Package/olsrd-mod-netjson + $(call Package/olsrd/template) + DEPENDS:=olsrd + TITLE:=netjson plugin with JSON output +endef + define Package/olsrd-mod-mdns $(call Package/olsrd/template) DEPENDS:=olsrd @@ -105,7 +111,6 @@ define Package/olsrd-mod-p2pd TITLE:=Peer to Peer Discovery plugin endef - define Package/olsrd-mod-pgraph $(call Package/olsrd/template) DEPENDS:=olsrd @@ -114,7 +119,7 @@ endef define Package/olsrd-mod-pud $(call Package/olsrd/template) - DEPENDS:=olsrd + DEPENDS:=olsrd +libgps +ncurses TITLE:=Position Update Distribution plugin endef @@ -166,7 +171,7 @@ MAKE_FLAGS+= \ DESTDIR="$(PKG_INSTALL_DIR)" \ STRIP="true" \ INSTALL_LIB="true" \ - SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog" + SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo netjson mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog" define Build/Compile $(call Build/Compile/Default,all) @@ -223,6 +228,11 @@ define Package/olsrd-mod-jsoninfo/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/jsoninfo/olsrd_jsoninfo.so.* $(1)/usr/lib/ endef +define Package/olsrd-mod-netjson/install + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/netjson/olsrd_netjson.so.* $(1)/usr/lib/ +endef + define Package/olsrd-mod-mdns/install $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/mdns/olsrd_mdns.so.* $(1)/usr/lib/ @@ -289,6 +299,7 @@ $(eval $(call BuildPackage,olsrd-mod-dyn-gw)) $(eval $(call BuildPackage,olsrd-mod-dyn-gw-plain)) $(eval $(call BuildPackage,olsrd-mod-httpinfo)) $(eval $(call BuildPackage,olsrd-mod-jsoninfo)) +$(eval $(call BuildPackage,olsrd-mod-netjson)) $(eval $(call BuildPackage,olsrd-mod-mdns)) $(eval $(call BuildPackage,olsrd-mod-nameservice)) $(eval $(call BuildPackage,olsrd-mod-p2pd))