build: include BUILD_VARIANT in PKG_BUILD_DIR

This changes the default PKG_BUILD_DIR to take BUILD_VARIANT into
account (if set), so that packages do not need to manually override
PKG_BUILD_DIR just to handle variants.

This also updates most base packages with variants to use the updated
default PKG_BUILD_DIR.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit e545fac8d9)
This commit is contained in:
Jeffery To
2019-08-04 04:45:06 +08:00
committed by Jo-Philipp Wich
parent 3f974a954d
commit cc7560eb22
17 changed files with 2 additions and 23 deletions

View File

@@ -66,8 +66,6 @@ ifeq ($(LOCAL_VARIANT),mesh)
CONFIG_VARIANT:=full
endif
PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(CONFIG_WPA_MSG_MIN_PRIORITY)