From b48a49bde813f150b8c30060ff9f933d7e57fb64 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 22 May 2024 11:38:49 +0200 Subject: [PATCH] host-build: always define Host/Prepare/Default We currently skip defining Host/Prepare/Default if HOST_UNPACK is not defined. This is mostly the case for Host packages that just provide files with the src directory and don't need to be downloaded/extracted. This was probably done lots of times ago due to quilt causing error as the patches directory wasn't present. This has changed now and quilt can correctly detect if no patches needs to be applied (instead of terminating with error) Always define Host/Prepare/Default to make tools/refresh correctly works as HOST_QUILT is hardcoded enabled for this make target and will complain for tool not prepared for quilt patches. Signed-off-by: Christian Marangi (cherry picked from commit 725389b7c745b0fa68426986c9bca14171f16887) --- include/host-build.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/host-build.mk b/include/host-build.mk index dba6b819da..2d0c416f6e 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -35,13 +35,11 @@ include $(INCLUDE_DIR)/autotools.mk _host_target:=$(if $(HOST_QUILT),,.) Host/Patch:=$(Host/Patch/Default) -ifneq ($(strip $(HOST_UNPACK)),) - define Host/Prepare/Default - $(HOST_UNPACK) +define Host/Prepare/Default + $(if $(strip $(HOST_UNPACK)),$(HOST_UNPACK)) [ ! -d ./src/ ] || $(CP) ./src/* $(HOST_BUILD_DIR) $(Host/Patch) - endef -endif +endef define Host/Prepare $(call Host/Prepare/Default) -- 2.25.1