From 1ee5b17e4f7b2c145524edfb51617c911fad7cc4 Mon Sep 17 00:00:00 2001 From: Marek Lindner Date: Tue, 14 Jan 2014 03:16:21 +0800 Subject: [PATCH] batman-adv: upgrade package to latest release 2014.0.0 Signed-off-by: Marek Lindner --- batman-adv/Makefile | 10 +++--- ...batctl-Add-CFLAGS-to-the-linker-step.patch | 33 ------------------- 2 files changed, 5 insertions(+), 38 deletions(-) delete mode 100644 batman-adv/patches/0001-batctl-Add-CFLAGS-to-the-linker-step.patch diff --git a/batman-adv/Makefile b/batman-adv/Makefile index e586b5d..0e0945b 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv -PKG_VERSION:=2013.4.0 -BATCTL_VERSION:=2013.4.0 +PKG_VERSION:=2014.0.0 +BATCTL_VERSION:=2014.0.0 PKG_RELEASE:=1 -PKG_MD5SUM:=6590caa324709289e3cb142273a5ff57 -BATCTL_MD5SUM:=42e269cc710bbc9a8fd17628201d4258 +PKG_MD5SUM:=8d58ecaede17dc05aab1b549dc09fa7d +BATCTL_MD5SUM:=b0bcf29fef80ddcc33769e13f5937d0a PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) @@ -29,7 +29,7 @@ define KernelPackage/batman-adv URL:=http://www.open-mesh.org/ MAINTAINER:=Marek Lindner SUBMENU:=Network Support - DEPENDS:=+kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc + DEPENDS:=+kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc TITLE:=B.A.T.M.A.N. Adv FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) diff --git a/batman-adv/patches/0001-batctl-Add-CFLAGS-to-the-linker-step.patch b/batman-adv/patches/0001-batctl-Add-CFLAGS-to-the-linker-step.patch deleted file mode 100644 index 492ae35..0000000 --- a/batman-adv/patches/0001-batctl-Add-CFLAGS-to-the-linker-step.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2c7bfe1299efa97438814bf6826a8f7ab3bc0b16 Mon Sep 17 00:00:00 2001 -From: Sven Eckelmann -Date: Tue, 7 May 2013 14:51:02 +0200 -Subject: [PATCH] batctl: Add CFLAGS to the linker step - -The GCC manual states for different parameters that the options for compilation -must also be used when linking. The options for compilation are stored in -CFLAGS and added to LINK.o to fix the behavior. - -Option which need this are for example -fPIC/-fPIE or -flto. - -Signed-off-by: Sven Eckelmann -Signed-off-by: Marek Lindner ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 311e70e..233f453 100755 ---- a/Makefile -+++ b/Makefile -@@ -53,7 +53,7 @@ RM ?= rm -f - INSTALL ?= install - MKDIR ?= mkdir -p - COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c --LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH) -+LINK.o = $(Q_LD)$(CC) $(CFLAGS) $(LDFLAGS) $(TARGET_ARCH) - - # standard install paths - PREFIX = /usr/local --- -1.7.10.4 -