Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv

On branch : master

commit d2d22675f863d8efcc0edfd78f1451a1ecbb98fe Author: Marek Lindner mareklindner@neomailbox.ch Date: Wed Jan 29 13:23:50 2014 +0800

batman-adv-devel: update to latest batctl master and add libnl build params

Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

d2d22675f863d8efcc0edfd78f1451a1ecbb98fe batman-adv-devel/Config.in | 2 +- batman-adv-devel/Makefile | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index fc8f917..9612da2 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -42,7 +42,7 @@ config KMOD_BATMAN_ADV_DEVEL_BATCTL_REV string prompt "batctl git revision to build package with" depends on PACKAGE_kmod-batman-adv-devel - default "f168d47" + default "b8eaea8" help Enter the full or shortened git revision to override package default value. This allows to build from non-master branches diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index dafa6ee..25699fe 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -33,7 +33,7 @@ define KernelPackage/batman-adv-devel URL:=http://www.open-mesh.org/ MAINTAINER:=Marek Lindner lindner_marek@yahoo.de SUBMENU:=Network Support - DEPENDS:=+kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc + DEPENDS:=+KMOD_BATMAN_ADV_DEVEL_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc +KMOD_BATMAN_ADV_DEVEL_BATCTL:libnl-tiny TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) @@ -81,7 +81,10 @@ TARGET_LDFLAGS += -fuse-linker-plugin MAKE_BATCTL_ENV += \ CPPFLAGS="$(TARGET_CPPFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ + LIBNL_NAME="libnl-tiny" \ + LIBNL_CFLAGS="-I$(STAGING_DIR)/usr/include/libnl-tiny" \ + LIBNL_LDLIBS="-lnl-tiny"

MAKE_BATCTL_ARGS += \ REVISION="$(PKG_BATCTL_SHORTREV)" \