projects / feed / routing.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
olsrd: use SPDX
[feed/routing.git] / olsrd / Makefile
diff --git a/olsrd/Makefile b/olsrd/Makefile
index 48dd7d20402914fefd8d3f0cadfd0fcad4854a4f..e64955d93da36976886f553f89de7ae9fa57747f 100644 (file)
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -1,21 +1,22 @@
-# 
-# Copyright (C) 2009-2012 OpenWrt.org
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# Copyright (C) 2009-2016 OpenWrt.org
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.6.6.2
-PKG_RELEASE:=3
+PKG_SOURCE_DATE:=2021-06-08
+PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git
+PKG_SOURCE_VERSION:=a42c2df17c0f97b5cf6fb8af13a17334a444ed7c
+PKG_MIRROR_HASH:=8c15bec590555c5e35fc81ab32727996d0f086c85d374f0128aae7d6947f8526
 
-PKG_MD5SUM:=e4e04bb033cffd99b3be397fa9063a54
-PKG_BUILD_PARALLEL:=1
+PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
+PKG_BUILD_PARALLEL:=0
+PKG_LICENSE:=BSD-3-Clause
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -37,7 +38,7 @@ define Package/olsrd
 endef
 
 define Package/olsrd/conffiles
-/etc/config/olsrd4
+/etc/config/olsrd
 /etc/config/olsrd6
 endef
 
@@ -53,6 +54,13 @@ define Package/olsrd-mod-dot-draw
   TITLE:=Dot topology information plugin
 endef
 
+
+define Package/olsrd-mod-filtergw
+  $(call Package/olsrd/template)
+  DEPENDS:=olsrd
+  TITLE:=Filter Gateway plugin
+endef
+
 define Package/olsrd-mod-bmf
   $(call Package/olsrd/template)
   DEPENDS:=olsrd +kmod-tun
@@ -83,6 +91,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
@@ -101,7 +115,6 @@ define Package/olsrd-mod-p2pd
   TITLE:=Peer to Peer Discovery plugin
 endef
 
-
 define Package/olsrd-mod-pgraph
   $(call Package/olsrd/template)
   DEPENDS:=olsrd
@@ -110,7 +123,7 @@ endef
 
 define Package/olsrd-mod-pud
   $(call Package/olsrd/template)
-  DEPENDS:=olsrd
+  DEPENDS:=olsrd +libgps
   TITLE:=Position Update Distribution plugin
 endef
 
@@ -162,7 +175,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 filtergw jsoninfo netjson mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog"
 
 define Build/Compile
        $(call Build/Compile/Default,all)
@@ -173,46 +186,27 @@ define Package/olsrd/install
        $(INSTALL_DIR) $(1)/lib/functions
        $(INSTALL_DATA) ./files/olsrd.init $(1)/lib/functions/olsrd.sh
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_DATA) ./files/olsrd4.config $(1)/etc/config/olsrd4
+       $(INSTALL_DATA) ./files/olsrd.config $(1)/etc/config/olsrd
        $(INSTALL_DATA) ./files/olsrd6.config $(1)/etc/config/olsrd6
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/olsrd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) ./files/olsrd4.init $(1)/etc/init.d/olsrd4
+       $(INSTALL_BIN) ./files/olsrd4.init $(1)/etc/init.d/olsrd
        $(INSTALL_BIN) ./files/olsrd6.init $(1)/etc/init.d/olsrd6
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
        $(INSTALL_BIN) ./files/olsrd.hotplug.sh $(1)/etc/hotplug.d/iface/50-olsrd
 endef
 
-define Package/olsrd/preinst
-#!/bin/sh
-# check if we are on real system
-if [ -z "$${IPKG_INSTROOT}" ]; then
-       [ -f /etc/config/olsrd ] && cp /etc/config/olsrd /etc/config/olsrd.opkg-old
-fi
-exit 0
-endef
-
-define Package/olsrd/postinst
-#!/bin/sh
-# check if we are on real system
-if [ -z "$${IPKG_INSTROOT}" ]; then
-        if [ -f /etc/config/olsrd.opkg-old ]; then
-               mv /etc/config/olsrd.opkg-old /etc/config/olsrd
-               echo "**********  WARNING  ***************"
-               echo "/etc/config/olsrd is no longer used! This will prevent olsrd to start."
-               echo "Please use /etc/config/olsrd4 for IPv4 and /etc/config/olrsd6 for IPv6"
-               echo "Remember to remove option IpVersion from your config file"
-       fi
-fi
-exit 0
-endef
-
 define Package/olsrd-mod-arprefresh/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/arprefresh/olsrd_arprefresh.so.* $(1)/usr/lib/
 endef
 
+define Package/olsrd-mod-filtergw/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/filtergw/olsrd_filtergw.so.* $(1)/usr/lib/
+endef
+
 define Package/olsrd-mod-dot-draw/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/dot_draw/olsrd_dot_draw.so.* $(1)/usr/lib/
@@ -243,6 +237,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/
@@ -304,11 +303,13 @@ endef
 $(eval $(call BuildPackage,olsrd))
 $(eval $(call BuildPackage,olsrd-mod-arprefresh))
 $(eval $(call BuildPackage,olsrd-mod-dot-draw))
+$(eval $(call BuildPackage,olsrd-mod-filtergw))
 $(eval $(call BuildPackage,olsrd-mod-bmf))
 $(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))
Mirror of routing feed