diff options
| author | Felix Fietkau <nbd@nbd.name> | 2021-11-04 15:54:27 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2021-11-04 16:43:32 +0100 |
| commit | 9faa22fcee8f9bc5310239661838ab68c7e7c104 (patch) | |
| tree | f30cf051bd511d430b1d37c084cfca7b7e019699 /include | |
| parent | 94b0849c19848beda9e1a215bcae0daac6927ff0 (diff) | |
| download | upstream-9faa22fcee8f9bc5310239661838ab68c7e7c104.tar.gz upstream-9faa22fcee8f9bc5310239661838ab68c7e7c104.tar.bz2 upstream-9faa22fcee8f9bc5310239661838ab68c7e7c104.zip | |
build: fix host package unpack if git-src is used
If the package download step is skipped, it needs to be performed for the host
build instead.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'include')
| -rw-r--r-- | include/host-build.mk | 2 | ||||
| -rw-r--r-- | include/package.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index cfa29419aa..b68c8c4536 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -205,5 +205,5 @@ endif define HostBuild $(HostBuild/Core) - $(if $(if $(PKG_HOST_ONLY),,$(STAMP_PREPARED)),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))) + $(if $(if $(PKG_HOST_ONLY),,$(if $(and $(filter host-%,$(MAKECMDGOALS)),$(PKG_SKIP_DOWNLOAD)),,$(STAMP_PREPARED))),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))) endef diff --git a/include/package.mk b/include/package.mk index 55d9352072..509ef61e08 100644 --- a/include/package.mk +++ b/include/package.mk @@ -13,6 +13,7 @@ PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install PKG_BUILD_PARALLEL ?= PKG_USE_MIPS16 ?= 1 PKG_IREMAP ?= 1 +PKG_SKIP_DOWNLOAD=$(USE_SOURCE_DIR)$(USE_GIT_TREE)$(USE_GIT_SRC_CHECKOUT) MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j)) @@ -264,7 +265,7 @@ define Build/CoreTargets endef define Build/DefaultTargets - $(if $(USE_SOURCE_DIR)$(USE_GIT_TREE)$(USE_GIT_SRC_CHECKOUT),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))) + $(if $(PKG_SKIP_DOWNLOAD),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))) $(if $(DUMP),,$(Build/CoreTargets)) define Build/DefaultTargets |