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: 36ba6237d6
("build: fix quilt for mixed package/host builds")
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
This commit is contained in:
parent
e097eb27af
commit
2ab0963971
1 changed files with 5 additions and 5 deletions
|
@ -8,6 +8,11 @@ ifeq ($(TARGET_BUILD),1)
|
||||||
PKG_BUILD_DIR:=$(LINUX_DIR)
|
PKG_BUILD_DIR:=$(LINUX_DIR)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq ($(filter host-refresh refresh,$(MAKECMDGOALS)),)
|
||||||
|
override QUILT=1
|
||||||
|
override HOST_QUILT=1
|
||||||
|
endif
|
||||||
|
|
||||||
ifneq ($(PKG_BUILD_DIR),)
|
ifneq ($(PKG_BUILD_DIR),)
|
||||||
QUILT?=$(if $(wildcard $(PKG_BUILD_DIR)/.quilt_used),y)
|
QUILT?=$(if $(wildcard $(PKG_BUILD_DIR)/.quilt_used),y)
|
||||||
ifneq ($(QUILT),)
|
ifneq ($(QUILT),)
|
||||||
|
@ -36,11 +41,6 @@ FILES_DIR?=./files
|
||||||
HOST_PATCH_DIR?=$(PATCH_DIR)
|
HOST_PATCH_DIR?=$(PATCH_DIR)
|
||||||
HOST_FILES_DIR?=$(FILES_DIR)
|
HOST_FILES_DIR?=$(FILES_DIR)
|
||||||
|
|
||||||
ifneq ($(filter host-refresh refresh,$(MAKECMDGOALS)),)
|
|
||||||
override QUILT=1
|
|
||||||
override HOST_QUILT=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
QUILT_CMD:=quilt --quiltrc=-
|
QUILT_CMD:=quilt --quiltrc=-
|
||||||
|
|
||||||
define filter_series
|
define filter_series
|
||||||
|
|
Loading…
Reference in a new issue