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

Merge pull request #422 from ecsv/batadv-18.06 

openwrt-18.06: batman-adv package fixes
This commit is contained in:
Simon Wunderlich 2018-10-18 15:01:58 +02:00 committed by GitHub
parent 8b760071d1 121c92d669
commit d1cf6d1949
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
alfred/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=alfred PKG_NAME:=alfred
PKG_VERSION:=2018.1 PKG_VERSION:=2018.1
PKG_RELEASE:=0 PKG_RELEASE:=1
PKG_HASH:=808fa6acf65c7a8e26405115176a5587157f746108cbe5dd974788eb05416d76 PKG_HASH:=808fa6acf65c7a8e26405115176a5587157f746108cbe5dd974788eb05416d76
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -59,7 +59,8 @@ MAKE_ALFRED_FLAGS=\
CONFIG_ALFRED_GPSD=$(if $(CONFIG_PACKAGE_ALFRED_GPSD),y,n) \ CONFIG_ALFRED_GPSD=$(if $(CONFIG_PACKAGE_ALFRED_GPSD),y,n) \
CONFIG_ALFRED_CAPABILITIES=n \ CONFIG_ALFRED_CAPABILITIES=n \
LIBNL_NAME="libnl-tiny" \ LIBNL_NAME="libnl-tiny" \
LIBNL_GENL_NAME="libnl-tiny" LIBNL_GENL_NAME="libnl-tiny" \
REVISION="openwrt-$(PKG_VERSION)-$(PKG_RELEASE)"
TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto
TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin

7
batctl/Makefile
View File

@ -10,15 +10,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batctl PKG_NAME:=batctl
PKG_VERSION:=2018.1 PKG_VERSION:=2018.1
PKG_RELEASE:=0 PKG_RELEASE:=1
PKG_HASH:=27877d0da6916f88a6cecbbb3f3d23cc4558ef7c7294324bf4fd050ed606b553 PKG_HASH:=27877d0da6916f88a6cecbbb3f3d23cc4558ef7c7294324bf4fd050ed606b553
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/batctl define Package/batctl
@ -62,7 +60,8 @@ MAKE_BATCTL_ARGS += \
REVISION="$(PKG_BATCTL_SHORTREV)" \ REVISION="$(PKG_BATCTL_SHORTREV)" \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
batctl install batctl install \
REVISION="openwrt-$(PKG_VERSION)-$(PKG_RELEASE)"
define Build/Compile define Build/Compile

1
batman-adv/Config.in
View File

@ -2,6 +2,7 @@
config KMOD_BATMAN_ADV_DEBUG_LOG config KMOD_BATMAN_ADV_DEBUG_LOG
bool "enable verbose debug logging" bool "enable verbose debug logging"
depends on PACKAGE_kmod-batman-adv depends on PACKAGE_kmod-batman-adv
depends on KMOD_BATMAN_ADV_DEBUGFS
default n default n
config KMOD_BATMAN_ADV_BLA config KMOD_BATMAN_ADV_BLA

10
batman-adv/Makefile
View File

@ -10,12 +10,15 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv PKG_NAME:=batman-adv
PKG_VERSION:=2018.1 PKG_VERSION:=2018.1
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_HASH:=b866b28dbbe5c9238abbdf5abbc30fc526dea56898ce4c1bd76d5c017843048b PKG_HASH:=b866b28dbbe5c9238abbdf5abbc30fc526dea56898ce4c1bd76d5c017843048b
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_EXTMOD_SUBDIRS=net/batman-adv
STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -27,7 +30,7 @@ define KernelPackage/batman-adv
DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211 DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211
TITLE:=B.A.T.M.A.N. Adv TITLE:=B.A.T.M.A.N. Adv
FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX) FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,cfg80211 batman-adv) AUTOLOAD:=$(call AutoProbe,batman-adv)
endef endef
define KernelPackage/batman-adv/description define KernelPackage/batman-adv/description
@ -66,7 +69,8 @@ NOSTDINC_FLAGS = \
-I$(STAGING_DIR)/usr/include/mac80211/uapi \ -I$(STAGING_DIR)/usr/include/mac80211/uapi \
-I$(PKG_BUILD_DIR)/include/ \ -I$(PKG_BUILD_DIR)/include/ \
-include backport/backport.h \ -include backport/backport.h \
-include $(PKG_BUILD_DIR)/compat-hacks.h -include $(PKG_BUILD_DIR)/compat-hacks.h \
-DBATADV_SOURCE_VERSION=\\\"openwrt-$(PKG_VERSION)-$(PKG_RELEASE)\\\"
COMPAT_SOURCES = \ COMPAT_SOURCES = \
$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \ $(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \

1
batman-adv/files/etc/config/batman-adv
View File

@ -18,4 +18,3 @@ config 'mesh' 'bat0'
# yet another batX instance # yet another batX instance
# config 'mesh' 'bat5' # config 'mesh' 'bat5'
# option 'interfaces' 'second_mesh'