diff --git a/batctl/Makefile b/batctl/Makefile index bf305a2..7901503 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -27,7 +27,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 + MAINTAINER:=Simon Wunderlich endef define Package/batctl/description diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 4c8e740..10314fa 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/batman-adv URL:=https://www.open-mesh.org/ - MAINTAINER:=Marek Lindner + MAINTAINER:=Simon Wunderlich 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 2372ce3..b4ed301 100644 --- 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 + URL:=https://www.open-mesh.org/ + MAINTAINER:=Corinna "Elektra" Aichele 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/patches/100-2.6.36.patch b/batmand/patches/100-2.6.36.patch index 566c23b..13318e0 100644 --- 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/vis/Makefile b/vis/Makefile new file mode 100644 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 +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/batmand/files/etc/config/vis b/vis/files/etc/config/vis similarity index 100% rename from batmand/files/etc/config/vis rename to vis/files/etc/config/vis diff --git a/batmand/files/etc/init.d/vis b/vis/files/etc/init.d/vis similarity index 100% rename from batmand/files/etc/init.d/vis rename to vis/files/etc/init.d/vis