jkimmel
/
firmware
forked from freifunk-franken/firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use blaII-branch instead of own blaII-source

This commit is contained in:
bjo 2012-01-05 23:04:06 +00:00
parent 6b1fd895a9
commit 38fa8fe184
9 changed files with 61 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build_configuration/Atheros_AR231x_AR5312/.config
View File

@ -2180,9 +2180,17 @@ CONFIG_PACKAGE_kmod-ipt-nathelper=y
# CONFIG_PACKAGE_kmod-atm is not set
# CONFIG_PACKAGE_kmod-ax25 is not set
# CONFIG_PACKAGE_kmod-batgat is not set
CONFIG_PACKAGE_kmod-batman-adv=y
#CONFIG_PACKAGE_kmod-batman-adv=y
# CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_BATCTL=y
#CONFIG_KMOD_BATMAN_ADV_BATCTL=y
CONFIG_PACKAGE_kmod-batman-adv-devel=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN is not set
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME="bla2"
# CONFIG_PACKAGE_kmod-bonding is not set
# CONFIG_PACKAGE_kmod-capi is not set
# CONFIG_PACKAGE_kmod-gre is not set

12
build_configuration/Atheros_AR71xx_AR7240_AR913x/.config_wr1043nd
View File

@ -2269,9 +2269,17 @@ CONFIG_PACKAGE_kmod-ipt-nathelper=y
# CONFIG_PACKAGE_kmod-atm is not set
# CONFIG_PACKAGE_kmod-ax25 is not set
# CONFIG_PACKAGE_kmod-batgat is not set
CONFIG_PACKAGE_kmod-batman-adv=y
#CONFIG_PACKAGE_kmod-batman-adv=y
# CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_BATCTL=y
#CONFIG_KMOD_BATMAN_ADV_BATCTL=y
CONFIG_PACKAGE_kmod-batman-adv-devel=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN is not set
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME="bla2"
# CONFIG_PACKAGE_kmod-bonding is not set
# CONFIG_PACKAGE_kmod-capi is not set
# CONFIG_PACKAGE_kmod-gre is not set

12
build_configuration/Atheros_AR71xx_AR7240_AR913x/.config_wr741nd
View File

@ -2263,9 +2263,17 @@ CONFIG_PACKAGE_kmod-ipt-nathelper=y
# CONFIG_PACKAGE_kmod-atm is not set
# CONFIG_PACKAGE_kmod-ax25 is not set
# CONFIG_PACKAGE_kmod-batgat is not set
CONFIG_PACKAGE_kmod-batman-adv=y
#CONFIG_PACKAGE_kmod-batman-adv=y
# CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_BATCTL=y
#CONFIG_KMOD_BATMAN_ADV_BATCTL=y
CONFIG_PACKAGE_kmod-batman-adv-devel=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN is not set
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME="bla2"
# CONFIG_PACKAGE_kmod-bonding is not set
# CONFIG_PACKAGE_kmod-capi is not set
# CONFIG_PACKAGE_kmod-gre is not set

12
build_configuration/Broadcom_BCM947xx_953xx_adhoc/.config
View File

@ -2246,9 +2246,17 @@ CONFIG_PACKAGE_kmod-ipt-nathelper=y
# CONFIG_PACKAGE_kmod-atm is not set
# CONFIG_PACKAGE_kmod-ax25 is not set
# CONFIG_PACKAGE_kmod-batgat is not set
CONFIG_PACKAGE_kmod-batman-adv=y
#CONFIG_PACKAGE_kmod-batman-adv=y
# CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_BATCTL=y
#CONFIG_KMOD_BATMAN_ADV_BATCTL=y
CONFIG_PACKAGE_kmod-batman-adv-devel=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN is not set
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME="bla2"
# CONFIG_PACKAGE_kmod-bonding is not set
# CONFIG_PACKAGE_kmod-capi is not set
# CONFIG_PACKAGE_kmod-gre is not set

12
build_configuration/Broadcom_BCM947xx_953xx_ap/.config
View File

@ -1365,9 +1365,17 @@ CONFIG_PACKAGE_kmod-ipt-nathelper=y
# CONFIG_PACKAGE_kmod-atm is not set
# CONFIG_PACKAGE_kmod-ax25 is not set
# CONFIG_PACKAGE_kmod-batgat is not set
CONFIG_PACKAGE_kmod-batman-adv=y
#CONFIG_PACKAGE_kmod-batman-adv=y
# CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_BATCTL=y
#CONFIG_KMOD_BATMAN_ADV_BATCTL=y
CONFIG_PACKAGE_kmod-batman-adv-devel=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN is not set
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME="bla2"
# CONFIG_PACKAGE_kmod-bonding is not set
# CONFIG_PACKAGE_kmod-capi is not set
# CONFIG_PACKAGE_kmod-gre is not set

12
build_configuration/ramips_rt3050/.config
View File

@ -1526,9 +1526,17 @@ CONFIG_PACKAGE_kmod-swconfig=y
# CONFIG_PACKAGE_kmod-atm is not set
# CONFIG_PACKAGE_kmod-ax25 is not set
# CONFIG_PACKAGE_kmod-batgat is not set
CONFIG_PACKAGE_kmod-batman-adv=y
#CONFIG_PACKAGE_kmod-batman-adv=y
# CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_BATCTL=y
#CONFIG_KMOD_BATMAN_ADV_BATCTL=y
CONFIG_PACKAGE_kmod-batman-adv-devel=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN is not set
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME="bla2"
# CONFIG_PACKAGE_kmod-bonding is not set
# CONFIG_PACKAGE_kmod-capi is not set
# CONFIG_PACKAGE_kmod-gre is not set

125
build_patches/blaII/Makefile
View File

@ -1,125 +0,0 @@
#
# Copyright (C) 2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $
include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv
PKG_VERSION:=blaII
BATCTL_VERSION:=blaII
PKG_MD5SUM:=24101b4e4420fdf13d51eb36bf82699f
BATCTL_MD5SUM:=ad93aec9d1c141c1175f36461f0be818
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://dev.freifunk-ol.de/blaII/
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
PKG_BATCTL_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/batctl-$(BATCTL_VERSION)
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/kernel.mk
define KernelPackage/batman-adv
URL:=http://www.freifunk-ol.de
MAINTAINER:=Bjoern Franke <bjoern@freifunk-ol.de>
SUBMENU:=Network Support
DEPENDS:=+kmod-lib-crc16
TITLE:=B.A.T.M.A.N. Adv blaII-rebased from Simon Wunderlich's git-repo
FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,batman-adv)
endef
define KernelPackage/batman-adv/description
B.A.T.M.A.N. advanced is a kernel module which allows to
build layer 2 mesh networks. This package contains the
version $(PKG_VERSION) of the kernel module plus its user space
configuration & managerment tool batctl.
endef
define KernelPackage/batman-adv/config
source "$(SOURCE)/Config.in"
endef
MAKE_BATMAN_ADV_ARGS += \
CROSS_COMPILE="$(TARGET_CROSS)" \
ARCH="$(LINUX_KARCH)" \
PATH="$(TARGET_PATH)" \
$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),EXTRA_CFLAGS="-DCONFIG_BATMAN_ADV_DEBUG") \
SUBDIRS="$(PKG_BUILD_DIR)" \
LINUX_VERSION="$(LINUX_VERSION)" \
REVISION="" modules
MAKE_BATCTL_ARGS += \
CFLAGS="$(TARGET_CFLAGS)" \
CCFLAGS="$(TARGET_CFLAGS)" \
OFLAGS="$(TARGET_CFLAGS)" \
REVISION="" \
CC="$(TARGET_CC)" \
NODEBUG=1 \
UNAME="Linux" \
DESTDIR="$(PKG_INSTALL_DIR)" \
STRIP="/bin/true" \
batctl install
ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),)
define Download/batctl
FILE:=batctl-$(BATCTL_VERSION).tar.gz
URL:=$(PKG_SOURCE_URL)
MD5SUM:=$(BATCTL_MD5SUM)
endef
$(eval $(call Download,batctl))
EXTRACT_BATCTL = tar xzf "$(DL_DIR)/batctl-$(BATCTL_VERSION).tar.gz" -C "$(BUILD_DIR)/$(PKG_NAME)"
PATCH_BATCTL = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)","*batctl*")
BUILD_BATCTL = $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS)
endif
KPATCH ?= $(PATCH)
define Build/DoPatch
@if [ -d "$(2)" ]; then \
if [ "$$$$(ls $(2) | grep -Ec $(3))" -gt 0 ]; then \
$(KPATCH) "$(1)" "$(2)" "$(3)"; \
fi; \
fi
endef
define Build/Patch
$(call Build/DoPatch,"$(PKG_BUILD_DIR)","$(PATCH_DIR)","*batman*")
$(EXTRACT_BATCTL)
$(PATCH_BATCTL)
endef
define Build/Compile
cp $(PKG_BUILD_DIR)/Makefile.kbuild $(PKG_BUILD_DIR)/Makefile
$(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATMAN_ADV_ARGS)
$(BUILD_BATCTL)
endef
define Build/Clean
rm -rf $(BUILD_DIR)/$(PKG_NAME)/
endef
ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),)
define KernelPackage/batman-adv/install
$(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/lib/batman-adv
$(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d
$(INSTALL_BIN) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv
$(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/
endef
else
define KernelPackage/batman-adv/install
$(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/lib/batman-adv
$(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d
$(INSTALL_BIN) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv
$(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config
endef
endif
$(eval $(call KernelPackage,batman-adv))

1
build_patches/feeds.conf
View File

@ -1,4 +1,5 @@
src-svn packages svn://svn.openwrt.org/openwrt/packages@29597
src-svn batman http://downloads.open-mesh.org/svn/openwrt-feed
#src-svn xwrt http://x-wrt.googlecode.com/svn/branches/backfire_10.03/package
#src-svn luci http://svn.luci.subsignal.org/luci/branches/luci-0.10/contrib/package
#src-svn phone svn://svn.openwrt.org/openwrt/feeds/phone

2
build_script.sh
View File

@ -13,8 +13,6 @@ prepare() {
./build_dir/scripts/feeds install -a
# Patch Batman
svn export ./build_patches/blaII/Makefile build_dir/feeds/packages/net/batman-adv/Makefile
}
configure_build() {