Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'openwrt/for-14.07' into for-14.07

Browse source
This commit is contained in:
Henning Rogge 2015-08-10 14:10:22 +02:00
commit 530e8c47db
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bmx6/Makefile
View file

@ -31,8 +31,8 @@ PKG_SOURCE_PROTO:=git
#PKG_SOURCE_URL:=git://bmx6.net/bmx6.git #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
PKG_SOURCE_URL:=git://github.com/axn/bmx6.git PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
PKG_REV:=b6107880b5460625b7ce9359dbeac0cfe863f58c PKG_REV:=8f26909e8808ed7fab0359afc15a3e44563fbd40
PKG_VERSION:=r2015060501 PKG_VERSION:=r2015061604
PKG_RELEASE:=4 PKG_RELEASE:=4
PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_VERSION:=$(PKG_REV)
@ -48,7 +48,7 @@ TARGET_CFLAGS += $(FPIC)
MAKE_ARGS += \ MAKE_ARGS += \
EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DNO_DEBUG_ALL -DNO_DEBUG_DUMP" \ EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DNO_DEBUG_ALL -DNO_DEBUG_DUMP" \
EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib " \ EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib " \
REVISION_VERSION="$(PKG_REV)" \ GIT_REV="$(PKG_REV)" \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
INSTALL_DIR="$(PKG_INSTALL_DIR)" \ INSTALL_DIR="$(PKG_INSTALL_DIR)" \
STRIP="/bin/false" \ STRIP="/bin/false" \

9
olsrd/Makefile
View file

@ -8,14 +8,15 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=olsrd PKG_NAME:=olsrd
PKG_VERSION:=0.6.6.2 PKG_VERSION:=0.9.0.2
PKG_RELEASE:=4 PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.9
PKG_MD5SUM:=e4e04bb033cffd99b3be397fa9063a54 PKG_MD5SUM:=8a2675c33990706cc291b59934024783
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=BSD-3-Clause
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
olsrd/files/olsrd.init
View file

@ -38,7 +38,7 @@ validate_varname() {
validate_olsrd_option() { validate_olsrd_option() {
local str="$1" local str="$1"
[ -z "$str" -o "$str" != "${str%%[! 0-9A-Za-z./|:_-]*}" ] && return 1 [ -z "$str" -o "$str" != "${str%%[! 0-9A-Za-z.%/|:_-]*}" ] && return 1
return 0 return 0
} }