From 96e06051e15908be9ada8a74466c9409df5d21ac Mon Sep 17 00:00:00 2001 From: Marek Lindner Date: Mon, 5 May 2008 20:35:45 +0000 Subject: [PATCH] updated to latest stable version SVN-Revision: 11051 --- net/batman-advanced/Makefile | 2 +- net/batman/Makefile | 8 ++++---- net/batman/patches/001-extra_cflags.patch | 12 ------------ 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 net/batman/patches/001-extra_cflags.patch diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile index f7ebfbbb99..5a66ee3725 100644 --- a/net/batman-advanced/Makefile +++ b/net/batman-advanced/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batmand-adv -PKG_REV:=989 +PKG_REV:=1057 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 PKG_BRANCH:=batman-adv-userspace diff --git a/net/batman/Makefile b/net/batman/Makefile index 74d85673c7..e6b3919ca1 100644 --- a/net/batman/Makefile +++ b/net/batman/Makefile @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batmand -PKG_REV:=989 +PKG_REV:=1057 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 -PKG_BRANCH:=batman +PKG_BRANCH:=batman-0.3 PKG_SOURCE_PROTO:=svn PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_SUBDIR:=$(PKG_BRANCH)d-$(PKG_VERSION) -PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/$(PKG_BRANCH) +PKG_SOURCE_SUBDIR:=$(PKG_BRANCH)-$(PKG_VERSION) +PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/tags/$(PKG_BRANCH) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install diff --git a/net/batman/patches/001-extra_cflags.patch b/net/batman/patches/001-extra_cflags.patch deleted file mode 100644 index ac6384f76d..0000000000 --- a/net/batman/patches/001-extra_cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN batmand-r963/linux/modules/Makefile.kbuild batmand-r963.new/linux/modules/Makefile.kbuild ---- batmand-r963/linux/modules/Makefile.kbuild 2008-01-28 08:47:35.000000000 +0100 -+++ batmand-r963.new/linux/modules/Makefile.kbuild 2008-03-02 18:24:49.000000000 +0100 -@@ -3,7 +3,7 @@ - endif - - LINUX26:=2.6 --CFLAGS +=-DREVISION_VERSION=\"\ rv$(REVISION)\" -+EXTRA_CFLAGS +=-DREVISION_VERSION=\"\ rv$(REVISION)\" - - ifeq ($(strip $(findstring $(LINUX26),$(LINUX_VERSION))),$(LINUX26)) - -- 2.30.2