From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Sat, 3 Jun 2017 11:17:16 +0000 (+0200)
Subject: build: fix kernel refresh failure on first run
X-Git-Tag: v18.06.0-rc1~2780
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2ab0963971ef771cfcc2c355ec6d8a47c6ea62ed;p=openwrt%2Fstaging%2Fxback.git

build: fix kernel refresh failure on first run

Override {HOST_}QUILT before making decisions based on it, else it will
cause target/linux/refresh to fail on first run.

Fixes: 36ba6237d6e3a23fbeadcc1812a892faa4b07cbe ("build: fix quilt for mixed package/host builds")
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
---

diff --git a/include/quilt.mk b/include/quilt.mk
index 03d19bf39c..7f525e2e93 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -8,6 +8,11 @@ ifeq ($(TARGET_BUILD),1)
   PKG_BUILD_DIR:=$(LINUX_DIR)
 endif
 
+ifneq ($(filter host-refresh refresh,$(MAKECMDGOALS)),)
+  override QUILT=1
+  override HOST_QUILT=1
+endif
+
 ifneq ($(PKG_BUILD_DIR),)
   QUILT?=$(if $(wildcard $(PKG_BUILD_DIR)/.quilt_used),y)
   ifneq ($(QUILT),)
@@ -36,11 +41,6 @@ FILES_DIR?=./files
 HOST_PATCH_DIR?=$(PATCH_DIR)
 HOST_FILES_DIR?=$(FILES_DIR)
 
-ifneq ($(filter host-refresh refresh,$(MAKECMDGOALS)),)
-  override QUILT=1
-  override HOST_QUILT=1
-endif
-
 QUILT_CMD:=quilt --quiltrc=-
 
 define filter_series