summaryrefslogtreecommitdiff
path: root/batman-adv
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2017-01-27 13:23:39 +0100
committerSimon Wunderlich <sw@simonwunderlich.de>2017-01-27 15:00:56 +0100
commita6c7413594a0e4b42dab42bb5fa68534e39b7d0c (patch)
treeb152c23ca84f644105553d62ec953078b2757986 /batman-adv
parentcdaf1e2144918f1a19c46608589fef16e34c4bb2 (diff)
batman-adv: use kernel-specific PKG_BUILD_DIR
The batman-adv Makefile set a PKG_BUILD_DIR outside of KERNEL_BUILD_DIR; this could lead to batman-adv not being rebuilt when switching targets and thus kernel configurations. This resulted in ABI mismatches and occasionally broke the build with messages like the following: Package kmod-batman-adv is missing dependencies for the following libraries: crc16.ko Instead of setting a better PKG_BUILD_DIR ourselves, we can just remove the explicit PKG_BUILD_DIR definition and include kernel.mk before package.mk to get the default definition used by other kernel module packages. Reported-by: David Lutz <kpanic@hirnduenger.de> Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'batman-adv')
-rw-r--r--batman-adv/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index df64571..4c8e740 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -11,17 +11,15 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv
PKG_VERSION:=2016.5
-PKG_RELEASE:=0
+PKG_RELEASE:=1
PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
PKG_LICENSE:=GPL-2.0
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
define KernelPackage/batman-adv
URL:=https://www.open-mesh.org/