wifidog-ng: remove incorrect PKG_BUILD_DIR override
authorMatthias Schiffer <mschiffer@universe-factory.net>
Sun, 3 May 2020 18:51:09 +0000 (20:51 +0200)
committerMatthias Schiffer <mschiffer@universe-factory.net>
Sat, 9 May 2020 12:04:19 +0000 (14:04 +0200)
As wifidog-ng builds a kernel module, it must use a PKG_BUILD_DIR in
KERNEL_BUILD_DIR instead of BUILD_DIR, otherwise old build artifacts may
be incorrectly reused when switching between different targets of same
architecture without a full clean.

Instead of fixing up the override, just remove it and instead move the
kernel.mk include above package.mk, so PKG_BUILD_DIR is set up correctly
by default.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
(cherry picked from commit 25babf817f1a45daf58e9af597f55ad93bb7c6fa)

net/wifidog-ng/Makefile

index 3909e2a13c9a766c88712f3f4bd7d340878ddfb0..a39d732dc2f8c43e5b831caaa14c0df2f0cea51e 100644 (file)
@@ -11,13 +11,12 @@ PKG_NAME:=wifidog-ng
 PKG_VERSION:=2.0.0
 PKG_RELEASE:=2
 
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)
-
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_MAINTAINER:=Jianhui Zhao <jianhuizhao329@gmail.com>
 
+include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/wifidog-ng/default
@@ -77,8 +76,6 @@ Package/wifidog-ng-openssl/install = $(Package/wifidog-ng/default/install)
 Package/wifidog-ng-wolfssl/install = $(Package/wifidog-ng/default/install)
 Package/wifidog-ng-mbedtls/install = $(Package/wifidog-ng/default/install)
 
-include $(INCLUDE_DIR)/kernel.mk
-
 define KernelPackage/wifidog-ng
   SUBMENU:=Other modules
   TITLE:=Kernel module for wifidog-ng