diff mbox series

[1/2] toolchain: kernel-headers: fix check target for kernel Git tree

Message ID 20201121153341.7406-1-ynezz@true.cz
State Under Review
Delegated to: Petr Štetiar
Headers show
Series [1/2] toolchain: kernel-headers: fix check target for kernel Git tree | expand

Commit Message

Petr Štetiar Nov. 21, 2020, 3:33 p.m. UTC
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>
---
 toolchain/kernel-headers/Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index a4120d587dbf..1bc650dc3c78 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)