projects / feed / routing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 8a66ed1)
Merge pull request #269 from ecsv/batadv-fixes
authorSimon Wunderlich <sw@simonwunderlich.de>
Fri, 3 Feb 2017 18:06:32 +0000 (19:06 +0100)
committerGitHub <noreply@github.com>
Fri, 3 Feb 2017 18:06:32 +0000 (19:06 +0100)
batman-adv: maint patch import + settings fixes

15 files changed:
batctl/Makefile patch | blob | history
batman-adv/Makefile patch | blob | history
batmand/Makefile patch | blob | history
batmand/files/etc/config/vis [deleted file] patch | blob | history
batmand/files/etc/init.d/vis [deleted file] patch | blob | history
batmand/patches/100-2.6.36.patch patch | blob | history
nat46/Makefile patch | blob | history
olsrd/Makefile patch | blob | history
olsrd/files/olsrd.config patch | blob | history
olsrd/files/olsrd6.config patch | blob | history
olsrd/patches/.gitignore [new file with mode: 0644] patch | blob
olsrd/patches/missing-include-dirs-warning.patch [deleted file] patch | blob | history
vis/Makefile [new file with mode: 0644] patch | blob
vis/files/etc/config/vis [new file with mode: 0644] patch | blob
vis/files/etc/init.d/vis [new file with mode: 0644] patch | blob

diff --git a/batctl/Makefile b/batctl/Makefile
index 60c3dd9801a557012eb2fd71fa11c77b435b138a..24bd16bd21a694da4d3c4a8ffcebdbdc4994ea18 100644 (file)
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -28,7 +28,7 @@ define Package/batctl
   CATEGORY:=Network
   DEPENDS:=+kmod-batman-adv +libnl-tiny +libc +librt
   TITLE:=B.A.T.M.A.N. Advanced user space configuration tool batctl
-  MAINTAINER:=Marek Lindner <mareklindner@neomailbox.ch>
+  MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
 endef
 
 define Package/batctl/description
diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 23dd7324a4942588a6978ccde064b60ce76a171c..a2eb70272e5b6290f67696c6d831238bc9f066d3 100644 (file)
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/batman-adv
   URL:=https://www.open-mesh.org/
-  MAINTAINER:=Marek Lindner <mareklindner@neomailbox.ch>
+  MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
   SUBMENU:=Network Support
   DEPENDS:=+KMOD_BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211
   TITLE:=B.A.T.M.A.N. Adv
diff --git a/batmand/Makefile b/batmand/Makefile
index 2372ce367d83619829f411029176627f86f8f2bc..b4ed3017104136c9cd18a04a498afe2921b61118 100644 (file)
--- a/batmand/Makefile
+++ b/batmand/Makefile
@@ -9,24 +9,29 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=batmand
-PKG_REV:=1439
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=3
-PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
 
-PKG_HASH:=3c72ce2aae889944acfc898434c6e9573b20815862db1938f3132cc50b669667
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://sources.lede-project.org https://downloads.openwrt.org/sources
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://git.open-mesh.org/batmand.git
+PKG_REV:=b67a7087b51d7a5e90d27ac39116d1f57257c86e
+PKG_VERSION:=1440
+PKG_RELEASE:=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_MIRROR_HASH:=ceb8e0e399f79b1b663594fcf9642e1efc40e696a7604daf709c77da9b6ec52f
+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
 
 define Package/batmand/Default
-  URL:=http://www.open-mesh.org/
-  MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
+  URL:=https://www.open-mesh.org/
+  MAINTAINER:=Corinna "Elektra" Aichele <onelektra@gmx.net>
 endef
 
 define Package/batmand
@@ -42,19 +47,6 @@ define Package/batmand/description
 B.A.T.M.A.N. layer 3 routing daemon
 endef
 
-define Package/vis
-$(call Package/batmand/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  DEPENDS:=+libpthread
-  TITLE:=visualization server for B.A.T.M.A.N. layer 3
-endef
-        
-define Package/vis/description
-visualization server for B.A.T.M.A.N. layer 3
-endef
-
 define KernelPackage/batgat
 $(call Package/batmand/Default)
   SUBMENU:=Network Support
@@ -80,18 +72,6 @@ MAKE_BATMAND_ARGS += \
        INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
        STRIP="/bin/true" \
        batmand install
-       
-MAKE_VIS_ARGS += \
-       EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)' \
-       CCFLAGS="$(TARGET_CFLAGS)" \
-       OFLAGS="$(TARGET_CFLAGS)" \
-       REVISION="$(PKG_REV)" \
-       CC="$(TARGET_CC)" \
-       NODEBUG=1 \
-       UNAME="Linux" \
-       INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
-       STRIP="/bin/true" \
-       vis install
 
 MAKE_BATGAT_ARGS += \
        CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -106,11 +86,7 @@ define Build/Configure
 endef
 
 ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),)
-       BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS)
-endif
-
-ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_vis),)
-       BUILD_VIS := $(MAKE) -C $(PKG_BUILD_DIR)/vis $(MAKE_VIS_ARGS)
+       BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_BATMAND_ARGS)
 endif
        
 ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)
@@ -119,7 +95,6 @@ endif
                
 define Build/Compile
        $(BUILD_BATMAND)
-       $(BUILD_VIS)
        cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile
        $(BUILD_BATGAT)
 endef
@@ -135,17 +110,5 @@ define Package/batmand/conffiles
 /etc/config/batmand
 endef
 
-define Package/vis/install
-       $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/vis $(1)/usr/sbin/
-       $(INSTALL_BIN) ./files/etc/init.d/vis $(1)/etc/init.d
-       $(INSTALL_DATA) ./files/etc/config/vis $(1)/etc/config
-endef
-
-define Package/vis/conffiles
-/etc/config/vis
-endef
-
 $(eval $(call BuildPackage,batmand))
-$(eval $(call BuildPackage,vis))
 $(eval $(call KernelPackage,batgat))
diff --git a/batmand/files/etc/config/vis b/batmand/files/etc/config/vis
deleted file mode 100644 (file)
index 6d30023..0000000
--- a/batmand/files/etc/config/vis
+++ /dev/null
@@ -1,3 +0,0 @@
-config vis general
-       option interface                ath0
-       
diff --git a/batmand/files/etc/init.d/vis b/batmand/files/etc/init.d/vis
deleted file mode 100644 (file)
index ef18eb7..0000000
--- a/batmand/files/etc/init.d/vis
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=90
-
-start () {
-       interface=$(uci get vis.general.interface)
-       if [ "$interface" = "" ]; then
-               echo $1 Error, you must specify at least a network interface
-               exit
-       fi
-       vis_args=$interface
-
-       vis $vis_args >/dev/null 2>&1
-}
-
-stop () {
-        killall vis
-}
-
-        
diff --git a/batmand/patches/100-2.6.36.patch b/batmand/patches/100-2.6.36.patch
index 566c23b66b35b0c361d59f1deee8493572bebc87..13318e0b3449c9232544ac35fc5dd0b1be30ae23 100644 (file)
--- a/batmand/patches/100-2.6.36.patch
+++ b/batmand/patches/100-2.6.36.patch
@@ -2,8 +2,8 @@
  batman/linux/modules/gateway.c |   19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
---- batmand-r1439.orig/batman/linux/modules/gateway.c
-+++ batmand-r1439/batman/linux/modules/gateway.c
+--- batmand-r1439.orig/linux/modules/gateway.c
++++ batmand-r1439/linux/modules/gateway.c
 @@ -29,6 +29,7 @@ static struct class *batman_class;
  static int batgat_open(struct inode *inode, struct file *filp);
  static int batgat_release(struct inode *inode, struct file *file);
diff --git a/nat46/Makefile b/nat46/Makefile
index 0283dd4f6e55aa9a92b0ae7a396eaa68c3330904..47b5a5bbdeeb1f295bb698db5b9fc575368ea8d3 100644 (file)
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=nat46
-PKG_VERSION:=7
+PKG_VERSION:=8
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8ff2ae59ec9840a7b8b45f976c51cae80abe0226
+PKG_SOURCE_VERSION:=1cd9fc7025906e1825767b05615d2cf02e1528da
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 
diff --git a/olsrd/Makefile b/olsrd/Makefile
index cce17b9e2e181ae5cdc2adaf4aa515e5b9b7bd6f..aa5de7a8d7e907c2ec5493cb6ba23349c99cfe99 100644 (file)
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.9.5
+PKG_VERSION:=0.9.6
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=v0.9.5
+PKG_SOURCE_VERSION:=v0.9.6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_MD5SUM:=
 
diff --git a/olsrd/files/olsrd.config b/olsrd/files/olsrd.config
index f4ddfd0d06322345cb8c51931857951a058f0695..15ea80a41867e7e5a3f3c4c0de7a3c4676bddd4c 100644 (file)
--- a/olsrd/files/olsrd.config
+++ b/olsrd/files/olsrd.config
@@ -14,10 +14,10 @@ config LoadPlugin
        list Net '0.0.0.0 0.0.0.0'
 
 config LoadPlugin
-       option library 'olsrd_nameservice.so.0.3'
+       option library 'olsrd_nameservice.so.0.4'
 
 config LoadPlugin
-       option library 'olsrd_txtinfo.so.0.1'
+       option library 'olsrd_txtinfo.so.1.1'
        option accept '0.0.0.0'
 
 config Interface
diff --git a/olsrd/files/olsrd6.config b/olsrd/files/olsrd6.config
index 37349e4e1173e1ed7addb22a8542144f86908614..7a03f28de70f15a183a5910661ea3fa7240393d7 100644 (file)
--- a/olsrd/files/olsrd6.config
+++ b/olsrd/files/olsrd6.config
@@ -3,7 +3,7 @@ config olsrd
        #option config_file '/etc/olsrd6.conf'
 
 config LoadPlugin
-       option library 'olsrd_txtinfo.so.0.1'
+       option library 'olsrd_txtinfo.so.1.1'
        option accept '::'
        option port '2007'
 
diff --git a/olsrd/patches/.gitignore b/olsrd/patches/.gitignore
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/olsrd/patches/missing-include-dirs-warning.patch b/olsrd/patches/missing-include-dirs-warning.patch
deleted file mode 100644 (file)
index 2bf0895..0000000
--- a/olsrd/patches/missing-include-dirs-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur olsrd-0.9.5_orig/lib/pud/nmealib/Makefile.inc olsrd-0.9.5/lib/pud/nmealib/Makefile.inc
---- olsrd-0.9.5_orig/lib/pud/nmealib/Makefile.inc      2016-12-22 12:23:42.175283967 +0100
-+++ olsrd-0.9.5/lib/pud/nmealib/Makefile.inc   2016-12-22 12:24:24.591015066 +0100
-@@ -63,7 +63,7 @@
-                 -Wmissing-format-attribute -Wno-multichar -Wno-deprecated-declarations -Wendif-labels -Wwrite-strings \
-                 -Wbad-function-cast -Wpointer-arith -Wcast-qual -Wshadow -Wformat -Wsequence-point -Wcast-align \
-                 -Wnested-externs -Winline -Wdisabled-optimization -funit-at-a-time -fPIC -ggdb -Wformat=2 -Winit-self \
--                -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wconversion -Wdouble-promotion \
-+                -Wswitch-default -Wswitch-enum -Wconversion -Wdouble-promotion \
-                 -Werror=format-security -Wformat-security -Wformat-y2k -Wredundant-decls -Wundef -Wunreachable-code \
-                 -Wunused-parameter
- 
diff --git a/vis/Makefile b/vis/Makefile
new file mode 100644 (file)
index 0000000..316224a
--- /dev/null
+++ b/vis/Makefile
@@ -0,0 +1,74 @@
+#
+# Copyright (C) 2008-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=vis
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://git.open-mesh.org/vis.git
+PKG_REV:=e141311c6a4fc824efbad536c137ed279905d825
+PKG_VERSION:=1440
+PKG_RELEASE:=0
+PKG_LICENSE:=GPL-2.0
+
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+PKG_MIRROR_HASH:=fd4b337a56993eec9a03ad8e7918bccc7691aa8b2e5ab6dd7863350f07503285
+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
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/vis
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  DEPENDS:=+libpthread
+  TITLE:=visualization server for B.A.T.M.A.N. layer 3
+  URL:=https://www.open-mesh.org/
+  MAINTAINER:=Corinna "Elektra" Aichele <onelektra@gmx.net>
+endef
+
+define Package/vis/description
+visualization server for B.A.T.M.A.N. layer 3
+endef
+
+MAKE_VIS_ARGS += \
+       EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)' \
+       CCFLAGS="$(TARGET_CFLAGS)" \
+       OFLAGS="$(TARGET_CFLAGS)" \
+       REVISION="$(PKG_REV)" \
+       CC="$(TARGET_CC)" \
+       NODEBUG=1 \
+       UNAME="Linux" \
+       INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+       STRIP="/bin/true" \
+       vis install
+
+
+define Build/Configure
+endef
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_VIS_ARGS)
+endef
+
+define Package/vis/install
+       $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/vis $(1)/usr/sbin/
+       $(INSTALL_BIN) ./files/etc/init.d/vis $(1)/etc/init.d
+       $(INSTALL_DATA) ./files/etc/config/vis $(1)/etc/config
+endef
+
+define Package/vis/conffiles
+/etc/config/vis
+endef
+
+$(eval $(call BuildPackage,vis))
diff --git a/vis/files/etc/config/vis b/vis/files/etc/config/vis
new file mode 100644 (file)
index 0000000..6d30023
--- /dev/null
+++ b/vis/files/etc/config/vis
@@ -0,0 +1,3 @@
+config vis general
+       option interface                ath0
+       
diff --git a/vis/files/etc/init.d/vis b/vis/files/etc/init.d/vis
new file mode 100644 (file)
index 0000000..ef18eb7
--- /dev/null
+++ b/vis/files/etc/init.d/vis
@@ -0,0 +1,19 @@
+#!/bin/sh /etc/rc.common
+START=90
+
+start () {
+       interface=$(uci get vis.general.interface)
+       if [ "$interface" = "" ]; then
+               echo $1 Error, you must specify at least a network interface
+               exit
+       fi
+       vis_args=$interface
+
+       vis $vis_args >/dev/null 2>&1
+}
+
+stop () {
+        killall vis
+}
+
+        
Mirror of routing feed