From 47b3b22af052f3f75eb25df9631a211294bb4c1b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 19 Jan 2017 14:26:16 +0100 Subject: [PATCH] batman-adv-legacy: move to kernel build dir Fixes rebuild issues in similar targets with different kernel configurations. --- net/batman-adv-legacy/Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/net/batman-adv-legacy/Makefile b/net/batman-adv-legacy/Makefile index d4fce81..28cbe10 100644 --- a/net/batman-adv-legacy/Makefile +++ b/net/batman-adv-legacy/Makefile @@ -24,12 +24,11 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz BATCTL_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION) -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 +PKG_BATCTL_BUILD_DIR:=$(PKG_BUILD_DIR)/batctl-$(BATCTL_VERSION) + define KernelPackage/batman-adv-legacy URL:=http://www.open-mesh.org/ MAINTAINER:=Marek Lindner @@ -96,7 +95,7 @@ define Download/batctl-legacy endef $(eval $(call Download,batctl-legacy)) -BATCTL_EXTRACT = tar xzf "$(DL_DIR)/batctl-$(BATCTL_VERSION).tar.gz" -C "$(BUILD_DIR)/$(PKG_NAME)" +BATCTL_EXTRACT = tar xzf "$(DL_DIR)/batctl-$(BATCTL_VERSION).tar.gz" -C "$(PKG_BUILD_DIR)" BATCTL_PATCH = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)",batctl) BATCTL_BUILD = $(MAKE_BATCTL_ENV) $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS) BATCTL_INSTALL = $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/ @@ -129,10 +128,6 @@ define Build/Compile $(BATCTL_BUILD) endef -define Build/Clean - rm -rf $(BUILD_DIR)/$(PKG_NAME)/ -endef - define KernelPackage/batman-adv-legacy/install $(INSTALL_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/etc/hotplug.d/iface $(1)/lib/batman-adv $(1)/usr/sbin $(1)/lib/netifd/proto $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config