bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

batman-adv: upgrade to 0.2.x maintenance branch

Browse Source 
* get batman-adv & batctl sources from their respective maintenance branch
* offer option to enable verbose debug logging


git-svn-id: svn://svn.openwrt.org/openwrt/packages@19089 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
marek 2010-01-10 02:32:03 +00:00
parent c6eea4c5d7
commit acf2d70807
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/batman-advanced/Config.in Normal file
View File

@ -0,0 +1,4 @@
config KMOD_BATMAN_ADV_DEBUG_LOG
bool "enable verbose debug logging"
depends PACKAGE_kmod-batman-adv-kernelland
default n

29
net/batman-advanced/Makefile
View File

@ -9,21 +9,23 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv PKG_NAME:=batman-adv
PKG_REV:=1478 PKG_REV:=1545
PKG_VERSION:=r$(PKG_REV) PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_KMOD_VERSION=caf7148e887b57abf37ef89a1b5aedf314893c94
PKG_KMOD_FNAME=batman-adv-maint-$(PKG_KMOD_VERSION)
PKG_KMOD_BUILD_DIR:=$(BUILD_DIR)/batman-adv
PKG_SOURCE_PROTO:=svn PKG_SOURCE_PROTO:=svn
PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_SUBDIR:=batman-adv-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=batctl-0.2.x-$(PKG_VERSION)
PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/ PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/branches/batctl-0.2.x/
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman-adv-kernelland
PKG_TOOL_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-batctl-install PKG_TOOL_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-batctl-install
PKG_TOOL_BUILD_DIR:=$(PKG_BUILD_DIR)/batctl PKG_TOOL_BUILD_DIR:=$(PKG_BUILD_DIR)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
@ -42,15 +44,25 @@ $(call Package/batman-adv/Default)
AUTOLOAD:=$(call AutoLoad,50,batman-adv) AUTOLOAD:=$(call AutoLoad,50,batman-adv)
endef endef
define KernelPackage/batman-adv-kernelland/config
source "$(SOURCE)/Config.in"
endef
define KernelPackage/batman-adv-kernelland/description define KernelPackage/batman-adv-kernelland/description
B.A.T.M.A.N. layer 2 B.A.T.M.A.N. layer 2
endef endef
define Download/batman-adv-maint
FILE:=$(PKG_KMOD_FNAME)
URL:=http://git.open-mesh.org/snapshot
endef
$(eval $(call Download,batman-adv-maint))
MAKE_BATADV_KERNELLAND_ARGS += \ MAKE_BATADV_KERNELLAND_ARGS += \
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
PATH="$(TARGET_PATH)" \ PATH="$(TARGET_PATH)" \
$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),EXTRA_FLAGS="-DCONFIG_BATMAN_ADV_DEBUG") \
SUBDIRS="$(PKG_KMOD_BUILD_DIR)" \ SUBDIRS="$(PKG_KMOD_BUILD_DIR)" \
LINUX_VERSION="$(LINUX_VERSION)" \ LINUX_VERSION="$(LINUX_VERSION)" \
REVISION="$(PKG_REV)" modules REVISION="$(PKG_REV)" modules
@ -79,11 +91,16 @@ ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batman-adv-kernelland),)
endif endif
define Build/Compile define Build/Compile
tar xzf "$(DL_DIR)/$(PKG_KMOD_FNAME)" -C "$(BUILD_DIR)"
cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile
$(BUILD_KMOD_ADV) $(BUILD_KMOD_ADV)
$(BUILD_BATCTL) $(BUILD_BATCTL)
endef endef
define Build/Clean
rm -rf $(PKG_KMOD_BUILD_DIR)
endef
define KernelPackage/batman-adv-kernelland/install define KernelPackage/batman-adv-kernelland/install
$(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/usr/sbin $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/usr/sbin
$(INSTALL_BIN) ./files/etc/init.d/batman-adv-kernelland $(1)/etc/init.d $(INSTALL_BIN) ./files/etc/init.d/batman-adv-kernelland $(1)/etc/init.d