From 7d7797e7b3dfaebb7a899c5de97f31faefeeb327 Mon Sep 17 00:00:00 2001 From: Saverio Proto Date: Wed, 13 Feb 2013 18:08:10 +0000 Subject: [PATCH] olsrd: Version bump to 0.6.5.1 , note that tas plugin has been discontinued in this release and two new plugins are included, the pud and sgwdynspeed plugins SVN-Revision: 35594 --- net/olsrd/Makefile | 42 ++++++++++++++++---- net/olsrd/files/olsrd.pud.position.conf | 51 +++++++++++++++++++++++++ net/olsrd/files/olsrd.sgw.speed.conf | 14 +++++++ 3 files changed, 99 insertions(+), 8 deletions(-) create mode 100644 net/olsrd/files/olsrd.pud.position.conf create mode 100644 net/olsrd/files/olsrd.sgw.speed.conf diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile index 343ec6e42..aa736e933 100644 --- a/net/olsrd/Makefile +++ b/net/olsrd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd -PKG_VERSION:=0.6.4 +PKG_VERSION:=0.6.5.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6 -PKG_MD5SUM:=03b1c3660e823d906234c578057f3851 +PKG_MD5SUM:=13940bd3be3ecd0fad809c0bb6960b0d PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -107,6 +107,12 @@ define Package/olsrd-mod-pgraph TITLE:=output network topology for pgraph endef +define Package/olsrd-mod-pud + $(call Package/olsrd/template) + DEPENDS:=olsrd + TITLE:=Position Update Distribution plugin +endef + define Package/olsrd-mod-quagga $(call Package/olsrd/template) DEPENDS:=olsrd @@ -119,10 +125,10 @@ define Package/olsrd-mod-secure TITLE:=Message signing plugin to secure routing domain endef -define Package/olsrd-mod-tas +define Package/olsrd-mod-sgwdynspeed $(call Package/olsrd/template) DEPENDS:=olsrd - TITLE:=tas - tiny appliation server programming example + TITLE:=Smart Gateway dynamic speed plugin endef define Package/olsrd-mod-txtinfo @@ -137,17 +143,25 @@ define Package/olsrd-mod-watchdog TITLE:=Watchdog plugin endef +define Package/olsrd-mod-pud/conffiles +/etc/olsrd.d/olsrd.pud.position.conf +endef + define Package/olsrd-mod-secure/conffiles /etc/olsrd.d/olsrd_secure_key endef +define Package/olsrd-mod-sgwdynspeed/conffiles +/etc/olsrd.d/olsrd.sgw.speed.conf +endef + MAKE_FLAGS+= \ NO_DEBUG_MESSAGES=1 \ OS="linux" \ 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 quagga secure tas txtinfo watchdog" + SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog" define Build/Compile $(call Build/Compile/Default,all) @@ -218,6 +232,15 @@ define Package/olsrd-mod-pgraph/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/pgraph/olsrd_pgraph.so.* $(1)/usr/lib/ endef +define Package/olsrd-mod-pud/install + $(INSTALL_DIR) $(1)/etc/olsrd.d + $(CP) ./files/olsrd.pud.position.conf $(1)/etc/olsrd.d/ + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/pud/nmealib/lib/libnmea.so $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/pud/wireformat/lib/libOlsrdPudWireFormat.so $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/pud/olsrd_pud.so.* $(1)/usr/lib/ +endef + define Package/olsrd-mod-quagga/install $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/quagga/olsrd_quagga.so.* $(1)/usr/lib/ @@ -230,9 +253,11 @@ define Package/olsrd-mod-secure/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/secure/olsrd_secure.so.* $(1)/usr/lib/ endef -define Package/olsrd-mod-tas/install +define Package/olsrd-mod-sgwdynspeed/install + $(INSTALL_DIR) $(1)/etc/olsrd.d + $(CP) ./files/olsrd.sgw.speed.conf $(1)/etc/olsrd.d/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/tas/olsrd_tas.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/sgwdynspeed/olsrd_sgwdynspeed.so.* $(1)/usr/lib/ endef define Package/olsrd-mod-txtinfo/install @@ -257,8 +282,9 @@ $(eval $(call BuildPackage,olsrd-mod-mdns)) $(eval $(call BuildPackage,olsrd-mod-nameservice)) $(eval $(call BuildPackage,olsrd-mod-p2pd)) $(eval $(call BuildPackage,olsrd-mod-pgraph)) +$(eval $(call BuildPackage,olsrd-mod-pud)) $(eval $(call BuildPackage,olsrd-mod-quagga)) $(eval $(call BuildPackage,olsrd-mod-secure)) -$(eval $(call BuildPackage,olsrd-mod-tas)) +$(eval $(call BuildPackage,olsrd-mod-sgwdynspeed)) $(eval $(call BuildPackage,olsrd-mod-txtinfo)) $(eval $(call BuildPackage,olsrd-mod-watchdog)) diff --git a/net/olsrd/files/olsrd.pud.position.conf b/net/olsrd/files/olsrd.pud.position.conf new file mode 100644 index 000000000..0ab0fb749 --- /dev/null +++ b/net/olsrd/files/olsrd.pud.position.conf @@ -0,0 +1,51 @@ +# +# OLSrd PUD plugin position configuration file +# + +# GPS operating mode. +# Values : bad, 2d, 3d +# Default: bad +# Note : a value of 'bad' will make the resulting position information invalid +# (the mask will indicate that all other information is not present) +#fix = bad + +# GPS quality indicator. +# Values : bad, low, mid, high +# Default: high +#sig = high + +# HDOP (Horizontal Dilution Of Precision) +# Values : floating point value +# Default: 0.0 +# Note : From HDOP, VDOP and PDOP are determined: VDOP = HDOP, and PDOP = sqrt(2) * HDOP. +#hdop = 0.0 + +# Latitude +# Values : floating point value +# Unit is NMEA like latitude: ddmm.sssss (d=degrees, m=minutes, s=seconds) +# Default: 0000.00000 +#lat = 0000.00000 + +# Longitude +# Values: floating point value +# Unit is NMEA like longitude: dddmm.sssss (d=degrees, m=minutes, s=seconds) +# Default: 00000.00000 +#lon = 00000.00000 + +# Elevation +# Values: floating point value +# Unit is meters above the mean sea level (geoid) +# Default: 0.0 +#elv = 0.0 + +# Speed +# Values: floating point value +# Unit is over the ground in kph +# Default: 0.0 +#speed = 0.0 + +# Direction/Track +# Values: floating point value +# Unit is (compass) degrees +# Default: 0.0 +#direction = 0.0 diff --git a/net/olsrd/files/olsrd.sgw.speed.conf b/net/olsrd/files/olsrd.sgw.speed.conf new file mode 100644 index 000000000..ae795d87d --- /dev/null +++ b/net/olsrd/files/olsrd.sgw.speed.conf @@ -0,0 +1,14 @@ +# +# OLSrd Smart Gateway uplink speed configuration file +# + + +# +# Upstream speed in kilobit/s +# Default: 128 +#upstream=128 + +# +# Downstream speed in kilobit/s +# Default: 1024 +#downstream=1024 -- 2.30.2