From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 4 Nov 2021 14:54:27 +0000 (+0100)
Subject: build: fix host package unpack if git-src is used
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9faa22fcee8f9bc5310239661838ab68c7e7c104;p=openwrt%2Fstaging%2Fjow.git

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>
---

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