Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/openwrt/archive.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2017-01-09 12:58:39 +0300
committerGitHub <noreply@github.com>2017-01-09 12:58:39 +0300
commit1a7b132013057ff38964c8ae1c27a36f24e4d9be (patch)
tree013fff42c672c538a13a764ff5b34d88d57b5b6c
parent8ff6e1eadcb0fba6fad9dba05df1eb6657804319 (diff)
parent6247555ee2a9133b2cd2fe7edd7c0593eff4d033 (diff)
Merge pull request #171 from NeoRaider/staging-dir-hostpkg
Add STAGING_DIR_HOSTPKG variable
-rw-r--r--include/host-build.mk2
-rw-r--r--rules.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/host-build.mk b/include/host-build.mk
index 72b32597d4..ebc7279bed 100644
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -30,7 +30,7 @@ BUILD_TYPES += host
HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),)))
HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured
HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
-HOST_BUILD_PREFIX:=$(if $(IS_PACKAGE_BUILD),$(STAGING_DIR)/host,$(STAGING_DIR_HOST))
+HOST_BUILD_PREFIX:=$(if $(IS_PACKAGE_BUILD),$(STAGING_DIR_HOSTPKG),$(STAGING_DIR_HOST))
HOST_STAMP_INSTALLED:=$(HOST_BUILD_PREFIX)/stamp/.$(PKG_NAME)_installed
override MAKEFLAGS=
diff --git a/rules.mk b/rules.mk
index 22807da7f0..5f5aec1bc6 100644
--- a/rules.mk
+++ b/rules.mk
@@ -137,6 +137,7 @@ PKG_INFO_DIR := $(STAGING_DIR)/pkginfo
BUILD_DIR_HOST:=$(if $(IS_PACKAGE_BUILD),$(BUILD_DIR)/host,$(BUILD_DIR_BASE)/host)
STAGING_DIR_HOST:=$(TOPDIR)/staging_dir/host
+STAGING_DIR_HOSTPKG:=$(STAGING_DIR)/host
TARGET_PATH:=$(subst $(space),:,$(filter-out .,$(filter-out ./,$(subst :,$(space),$(PATH)))))
TARGET_INIT_PATH:=$(call qstrip,$(CONFIG_TARGET_INIT_PATH))