X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=bmx7%2FMakefile;h=7813856dc08af08cee1f94a26e4027dd5fd30ab2;hb=b65ef40e46e2fdd86c33491a973d07b648e6caec;hp=e1eb36b203e3756f0e76d91f1e2e0524939902c8;hpb=546405983f03ae6fee5d1de1f7ddb44b39583ad5;p=feed%2Frouting.git diff --git a/bmx7/Makefile b/bmx7/Makefile index e1eb36b..7813856 100644 --- a/bmx7/Makefile +++ b/bmx7/Makefile @@ -1,71 +1,51 @@ -# Copyright (C) 2011 Fundacio Privada per a la Xarxa Oberta, Lliure i Neutral guifi.net -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# The full GNU General Public License is included in this distribution in -# the file called "COPYING". -# -# Contibutors: -# Axel Neumann, Simó Albert i Beltran, Pau Escrich -# - - include $(TOPDIR)/rules.mk PKG_NAME:=bmx7 +PKG_VERSION:=7.1.1 +PKG_RELEASE:=5 -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:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/bmx-routing/bmx7/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=5f88df1c95e5cb842a6016bb1604e3e7f6097c63c5c9916edc3c84e96d4f5f65 -PKG_REV:=379110ae442f80755b5788c527e722f9551b14eb -PKG_VERSION:=r2016072001 -PKG_RELEASE:=4 -PKG_LICENSE:=GPL-2.0 +PKG_MAINTAINER:=Axel Neumann +PKG_LICENSE:=GPL-2.0-or-later +PKG_LICENSE_FILES:=LICENSE -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) +PKG_BUILD_PARALLEL:=1 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" \ - EXTRA_LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib -liwinfo" \ - GIT_REV="$(PKG_REV)" \ - CC="$(TARGET_CC)" \ - INSTALL_DIR="$(PKG_INSTALL_DIR)" \ - build_all +MAKE_ARGS += EXTRA_CFLAGS="$(TARGET_CFLAGS) \ + -I. \ + -I$(STAGING_DIR)/usr/include \ + -DCRYPTLIB=MBEDTLS_2_8_0 \ + -DCORE_LIMIT=20000 \ + -DTRAFFIC_DUMP \ + -DNO_TRACE_FUNCTION_CALLS \ + -DBMX7_LIB_IWINFO" \ + EXTRA_LDFLAGS="$(TARGET_LDFLAGS) \ + -L$(STAGING_DIR)/usr/lib -liwinfo" \ + GIT_REV="$(PKG_REV)" \ + CC="$(TARGET_CC)" \ + INSTALL_DIR="$(PKG_INSTALL_DIR)" \ + build_all + +MAKE_PATH:=src define Package/bmx7/Default SECTION:=net CATEGORY:=Network SUBMENU:=Routing and Redirection TITLE:=BMX7 layer 3 routing daemon - URL:=http://bmx6.net/ - MAINTAINER:=Axel Neumann - DEPENDS:=+zlib +libpolarssl +libiwinfo + URL:=https://github.com/bmx-routing/bmx7 + DEPENDS:=+zlib +libmbedtls +libiwinfo endef define Package/bmx7/description -BMX7 routing daemon supporting securely-entrusted IPv6 (and IPv4in6) routing + BMX7 routing daemon supporting securely-entrusted IPv6 (and IPv4in6) routing endef define Package/bmx7 @@ -82,7 +62,7 @@ endef define Package/bmx7-iwinfo $(call Package/bmx7/Default) DEPENDS:=bmx7 +libiwinfo - TITLE:=link characteristics plugin based on libiwinfo (recommended!) + TITLE:=link characteristics plugin via libiwinfo (recommended!) endef define Package/bmx7-topology @@ -115,72 +95,64 @@ define Package/bmx7-table TITLE:=plugin to announce routes from tables via tunnels endef -define Build/Configure - mkdir -p $(PKG_INSTALL_DIR) -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) -endef - define Package/bmx7/install $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bmx7 $(1)/usr/sbin/bmx7 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/bmx7 $(1)/usr/sbin/bmx7 endef -define Package/bmx7/postinst -#!/bin/sh -# # check if we are on real system -if [ -z "$${IPKG_INSTROOT}" ]; then - if [ -f /etc/sysupgrade.conf ] && ! grep bmx7 /etc/sysupgrade.conf; then - echo /etc/bmx7 >> /etc/sysupgrade.conf - fi -fi +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(MAKE_ARGS) endef - define Package/bmx7-uci-config/conffiles /etc/config/bmx7 +/etc/bmx7 endef define Package/bmx7-uci-config/install $(INSTALL_DIR) $(1)/usr/lib $(1)/etc/config $(1)/etc/init.d - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_uci_config/bmx7_config.so $(1)/usr/lib/bmx7_config.so + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_uci_config/bmx7_config.so \ + $(1)/usr/lib/bmx7_config.so $(INSTALL_BIN) ./files/etc/init.d/bmx7 $(1)/etc/init.d/bmx7 $(INSTALL_DATA) ./files/etc/config/bmx7 $(1)/etc/config/bmx7 endef define Package/bmx7-iwinfo/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_iwinfo/bmx7_iwinfo.so $(1)/usr/lib/bmx7_iwinfo.so + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_iwinfo/bmx7_iwinfo.so \ + $(1)/usr/lib/bmx7_iwinfo.so endef define Package/bmx7-topology/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_topology/bmx7_topology.so $(1)/usr/lib/bmx7_topology.so + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_topology/bmx7_topology.so \ + $(1)/usr/lib/bmx7_topology.so endef define Package/bmx7-json/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_json/bmx7_json.so $(1)/usr/lib/bmx7_json.so + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_json/bmx7_json.so \ + $(1)/usr/lib/bmx7_json.so endef define Package/bmx7-sms/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_sms/bmx7_sms.so $(1)/usr/lib/bmx7_sms.so + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_sms/bmx7_sms.so \ + $(1)/usr/lib/bmx7_sms.so endef define Package/bmx7-tun/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_tun/bmx7_tun.so $(1)/usr/lib/bmx7_tun.so + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_tun/bmx7_tun.so \ + $(1)/usr/lib/bmx7_tun.so endef define Package/bmx7-table/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx7_table/bmx7_table.so $(1)/usr/lib/bmx7_table.so + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_table/bmx7_table.so \ + $(1)/usr/lib/bmx7_table.so endef - $(eval $(call BuildPackage,bmx7)) $(eval $(call BuildPackage,bmx7-uci-config)) $(eval $(call BuildPackage,bmx7-iwinfo))