aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-11-21 16:05:08 +0100
committerPetr Štetiar <ynezz@true.cz>2020-12-05 20:50:19 +0100
commit8c2bb1d9b6b71be31ff79c1783b42b457d305cd0 (patch)
tree1fcdec723e7737349b0ccf2179f850a8c550901b /toolchain
parenta47caacaf37e57389acc7618f23a7e64afaa9d8c (diff)
downloadupstream-8c2bb1d9b6b71be31ff79c1783b42b457d305cd0.tar.gz
upstream-8c2bb1d9b6b71be31ff79c1783b42b457d305cd0.tar.bz2
upstream-8c2bb1d9b6b71be31ff79c1783b42b457d305cd0.zip
toolchain: kernel-headers: fix check target for kernel Git tree
Currently the check target fails if the kernel Git tree is used: $ make toolchain/kernel-headers/{download,check} make[2]: Entering directory 'toolchain/kernel-headers' Makefile:105: *** ERROR: Unknown pack format for file openwrt/tmp/dl/. Stop. make[2]: Leaving directory 'toolchain/kernel-headers' toolchain/Makefile:100: recipe for target 'toolchain/kernel-headers/check' failed Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit bb7ba6b6a81d1fb7ac6075edfd8e8b713dd61db2)
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/kernel-headers/Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index f7842cb9bd..1da1946a14 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -17,11 +17,18 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=linux
PKG_VERSION:=$(LINUX_VERSION)
PKG_SOURCE:=$(LINUX_SOURCE)
-ifneq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"")
+ifneq ($(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI))
- PKG_SOURCE_VERSION:=$(CONFIG_KERNEL_GIT_REF)
+ PKG_SOURCE_VERSION:=$(call qstrip,$(CONFIG_KERNEL_GIT_REF))
+ifdef CHECK
+ include $(INCLUDE_DIR)/kernel-version.mk
+ PKG_VERSION:=$(LINUX_VERSION)
else
+ PKG_SOURCE:=$(LINUX_SOURCE)
+endif
+else
+ PKG_SOURCE:=$(LINUX_SOURCE)
PKG_SOURCE_URL:=$(LINUX_SITE)
endif
HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)