diff options
| author | Jonas Gorski <jonas.gorski@gmail.com> | 2017-06-03 13:17:16 +0200 |
|---|---|---|
| committer | Jonas Gorski <jonas.gorski@gmail.com> | 2017-06-04 10:36:48 +0200 |
| commit | 2ab0963971ef771cfcc2c355ec6d8a47c6ea62ed (patch) | |
| tree | c54a555ceed37fc76a47ba7c1c23728cc28af735 | |
| parent | e097eb27af4dcee394c13fbfc06e0bd51d4598ff (diff) | |
| download | upstream-2ab0963971ef771cfcc2c355ec6d8a47c6ea62ed.tar.gz upstream-2ab0963971ef771cfcc2c355ec6d8a47c6ea62ed.tar.bz2 upstream-2ab0963971ef771cfcc2c355ec6d8a47c6ea62ed.zip | |
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>
| -rw-r--r-- | include/quilt.mk | 10 |
1 files changed, 5 insertions, 5 deletions
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 |