batman-adv: upgrade to latest trunk/maint

git-svn-id: svn://svn.openwrt.org/openwrt/packages@19958 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
marek 2010-03-03 00:13:47 +00:00
parent 62ab0da953
commit e655420c6d

View File

@ -9,7 +9,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv PKG_NAME:=batman-adv
PKG_REV:=1568 PKG_REV:=1578
PKG_VERSION:=r$(PKG_REV) PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=1 PKG_RELEASE:=1
@ -19,12 +19,12 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_TOOL_VERSION=$(PKG_REV) PKG_TOOL_VERSION=$(PKG_REV)
ifneq ($(CONFIG_BATMAN_ADV_DEV),) ifneq ($(CONFIG_BATMAN_ADV_DEV),)
PKG_KMOD_VERSION=060c4d34077550d57cd57c5375dd5f8758391eb5 PKG_KMOD_VERSION=7e44e9275aafce871a91b9ab5f710ed953dda74c
PKG_KMOD_FNAME=batman-adv-dev-$(PKG_REV).tar.gz PKG_KMOD_FNAME=batman-adv-dev-$(PKG_REV).tar.gz
PKG_TOOL_URL=http://downloads.open-mesh.org/svn/batman/trunk/batctl PKG_TOOL_URL=http://downloads.open-mesh.org/svn/batman/trunk/batctl
PKG_TOOL_FNAME:=batctl-dev-$(PKG_TOOL_VERSION).tar.gz PKG_TOOL_FNAME:=batctl-dev-$(PKG_TOOL_VERSION).tar.gz
else else
PKG_KMOD_VERSION=1b58d49b4342caabb9624243bc76e037eaac2673 PKG_KMOD_VERSION=9234caa91ce04d0bba893738da960b88154e5474
PKG_KMOD_FNAME=batman-adv-maint-$(PKG_REV).tar.gz PKG_KMOD_FNAME=batman-adv-maint-$(PKG_REV).tar.gz
PKG_TOOL_URL=http://downloads.open-mesh.org/svn/batman/branches/batctl-0.2.x/ PKG_TOOL_URL=http://downloads.open-mesh.org/svn/batman/branches/batctl-0.2.x/
PKG_TOOL_FNAME:=batctl-maint-$(PKG_TOOL_VERSION).tar.gz PKG_TOOL_FNAME:=batctl-maint-$(PKG_TOOL_VERSION).tar.gz
@ -106,13 +106,13 @@ ifneq ($(DEVELOPER)$(CONFIG_BATMAN_ADV_DEV),)
endif endif
endif endif
mv "$(PKG_BUILD_DIR)/batman-adv" "$(PKG_KMOD_BUILD_DIR)" mv "$(PKG_BUILD_DIR)/batman-adv" "$(PKG_KMOD_BUILD_DIR)"
cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR),) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR),)
ifneq ($(CONFIG_BATMAN_ADV_DEV),) ifneq ($(CONFIG_BATMAN_ADV_DEV),)
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/dev,) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/dev,)
else else
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/maint,) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/maint,)
endif endif
cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile
endef endef
MAKE_BATADV_KERNELLAND_ARGS += \ MAKE_BATADV_KERNELLAND_ARGS += \