mirror
/
openwrt-routing
mirror of https://git.openwrt.org/feed/routing.git
1
0
Fork 0
Code Releases Activity

quagga: reorder things in Makefile 

- Fix SPDX License Identifier
- Use HTTPS in URL

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
This commit is contained in:
Josef Schlehofer 2022-02-26 11:43:24 +01:00 committed by Nick Hainke
parent 9652952036
commit 699106ac8e
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
quagga/Makefile
View File

@ -10,10 +10,18 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=quagga PKG_NAME:=quagga
PKG_VERSION:=1.2.4 PKG_VERSION:=1.2.4
PKG_RELEASE:=2 PKG_RELEASE:=2
PKG_HASH:=e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SAVANNAH/quagga/ PKG_SOURCE_URL:=@SAVANNAH/quagga/
PKG_HASH:=e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3
PKG_MAINTAINER:=Vasilis Tsiligiannis <acinonyx@openwrt.gr>
PKG_LICENSE:=GPL-2.0-or-later
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_IPV6 \ CONFIG_IPV6 \
CONFIG_PACKAGE_quagga-watchquagga \ CONFIG_PACKAGE_quagga-watchquagga \
@ -26,10 +34,6 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_quagga-ripd \ CONFIG_PACKAGE_quagga-ripd \
CONFIG_PACKAGE_quagga-ripngd \ CONFIG_PACKAGE_quagga-ripngd \
CONFIG_PACKAGE_quagga-vtysh CONFIG_PACKAGE_quagga-vtysh
PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -39,8 +43,7 @@ define Package/quagga/Default
SUBMENU:=Routing and Redirection SUBMENU:=Routing and Redirection
DEPENDS:=quagga DEPENDS:=quagga
TITLE:=The Quagga Software Routing Suite TITLE:=The Quagga Software Routing Suite
URL:=http://www.quagga.net URL:=https://www.quagga.net
MAINTAINER:=Vasilis Tsiligiannis <acinonyx@openwrt.gr>
endef endef
define Package/quagga define Package/quagga

11
quagga/patches/200-gcc10.patch
View File

@ -29,7 +29,11 @@
-const char *const PIM_ALL_ROUTERS; -const char *const PIM_ALL_ROUTERS;
-const char *const PIM_ALL_PIM_ROUTERS; -const char *const PIM_ALL_PIM_ROUTERS;
-const char *const PIM_ALL_IGMP_ROUTERS; -const char *const PIM_ALL_IGMP_ROUTERS;
- +extern const char *const PIM_ALL_SYSTEMS;
+extern const char *const PIM_ALL_ROUTERS;
+extern const char *const PIM_ALL_PIM_ROUTERS;
+extern const char *const PIM_ALL_IGMP_ROUTERS;
-struct thread_master *master; -struct thread_master *master;
-uint32_t qpim_debugs; -uint32_t qpim_debugs;
-int qpim_mroute_socket_fd; -int qpim_mroute_socket_fd;
@ -58,11 +62,6 @@
-int64_t qpim_mroute_del_events; -int64_t qpim_mroute_del_events;
-int64_t qpim_mroute_del_last; -int64_t qpim_mroute_del_last;
-struct list *qpim_static_route_list; /* list of routes added statically */ -struct list *qpim_static_route_list; /* list of routes added statically */
+extern const char *const PIM_ALL_SYSTEMS;
+extern const char *const PIM_ALL_ROUTERS;
+extern const char *const PIM_ALL_PIM_ROUTERS;
+extern const char *const PIM_ALL_IGMP_ROUTERS;
+
+extern struct thread_master *master; +extern struct thread_master *master;
+extern uint32_t qpim_debugs; +extern uint32_t qpim_debugs;
+extern int qpim_mroute_socket_fd; +extern int qpim_mroute_socket_fd;