batmand: Use git repository to retrieve sources

The current package is build around the subversion repository which does
not exist anymore. The package can therefore be moved to the git repository
to have an official source for the revision used in OpenWrt.

The SVN version of batman r1439 was actually r1435. The git export of revision
r1435 is referenced by this commit. The version number was only increased
to 1440 to create a new source tarball. SVN revision r1440 is not a commit
for batman and therefore no code changes in batman was done in r1440.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
Sven Eckelmann 2017-01-18 13:34:16 +01:00 committed by Zoltan HERPAI
parent 4eb57b4298
commit 6684bff253
2 changed files with 16 additions and 12 deletions

View File

@ -9,18 +9,22 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=batmand PKG_NAME:=batmand
PKG_REV:=1439
PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=4
PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
PKG_HASH:=3c72ce2aae889944acfc898434c6e9573b20815862db1938f3132cc50b669667 PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_URL:=git://git.open-mesh.org/batmand.git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_REV:=b67a7087b51d7a5e90d27ac39116d1f57257c86e
PKG_SOURCE_URL:=https://sources.lede-project.org https://downloads.openwrt.org/sources PKG_VERSION:=1440
PKG_RELEASE:=0
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman/linux/modules PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/linux/modules
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -81,7 +85,7 @@ define Build/Configure
endef endef
ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),) ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),)
BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS) BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_BATMAND_ARGS)
endif endif
ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),) ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)

View File

@ -2,8 +2,8 @@
batman/linux/modules/gateway.c | 19 +++++++++++++++++++ batman/linux/modules/gateway.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+) 1 file changed, 19 insertions(+)
--- batmand-r1439.orig/batman/linux/modules/gateway.c --- batmand-r1439.orig/linux/modules/gateway.c
+++ batmand-r1439/batman/linux/modules/gateway.c +++ batmand-r1439/linux/modules/gateway.c
@@ -29,6 +29,7 @@ static struct class *batman_class; @@ -29,6 +29,7 @@ static struct class *batman_class;
static int batgat_open(struct inode *inode, struct file *filp); static int batgat_open(struct inode *inode, struct file *filp);
static int batgat_release(struct inode *inode, struct file *file); static int batgat_release(struct inode *inode, struct file *file);