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

bmx: Use repos from https://github.com/bmx-routing and remove bmx7 json-c patch

This commit is contained in:
Axel Neumann 2018-01-02 18:06:23 +01:00
parent 69ef0bb2d0
commit 679f780747
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bmx6/Makefile
View File

@ -28,11 +28,11 @@ PKG_NAME:=bmx6
PKG_SOURCE_PROTO:=git
#PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
PKG_SOURCE_URL:=git://github.com/bmx-routing/bmx6.git
#PKG_SOURCE_URL:=file:///usr/src/bmx-routing/bmx6.git
PKG_REV:=4016a1980d900309771e432d1f7c741d6c48d477
PKG_VERSION:=r2017032301
PKG_VERSION:=r2018010201
PKG_RELEASE:=5
PKG_LICENSE:=GPL-2.0

13
bmx7/Makefile
View File

@ -27,12 +27,11 @@ PKG_NAME:=bmx7
PKG_SOURCE_PROTO:=git
#PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
#PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
PKG_SOURCE_URL:=git://github.com/bmx-routing/bmx7.git
#PKG_SOURCE_URL:=file:///usr/src/bmx-routing/bmx7.git
PKG_REV:=1b8cf4c119d3bf886a9b9c5a1bca8043506f3684
PKG_VERSION:=r2017071001
PKG_REV:=a0b18da22d4195afdea82ac080eba02f1121f86b
PKG_VERSION:=r2018010203
PKG_RELEASE:=4
PKG_LICENSE:=GPL-2.0
@ -45,7 +44,6 @@ include $(INCLUDE_DIR)/package.mk
TARGET_CFLAGS += $(FPIC)
#MAKE_ARGS += EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS -DBMX7_LIB_IWINFO"
MAKE_ARGS += EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=MBEDTLS_2_4_0 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS -DBMX7_LIB_IWINFO"
MAKE_ARGS += \
@ -60,9 +58,8 @@ define Package/bmx7/Default
CATEGORY:=Network
SUBMENU:=Routing and Redirection
TITLE:=BMX7 layer 3 routing daemon
URL:=http://bmx6.net/
URL:=http://github.com/bmx-routing/bmx7
MAINTAINER:=Axel Neumann <neumann@cgws.de>
# DEPENDS:=+zlib +libpolarssl +libiwinfo
DEPENDS:=+zlib +libmbedtls +libiwinfo
endef

13
bmx7/patches/001-json-c.patch
View File

@ -1,13 +0,0 @@
Index: bmx7-r2014112401/lib/bmx7_json/json.c
===================================================================
--- bmx7-r2014112401.orig/lib/bmx7_json/json.c
+++ bmx7-r2014112401/lib/bmx7_json/json.c
@@ -27,7 +27,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <stdint.h>
-#include <json/json.h>
+#include <json-c/json.h>
//#include <dirent.h>
//#include <sys/inotify.h>