From patchwork Sat Nov 21 15:33:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Petr_=C5=A0tetiar?= X-Patchwork-Id: 1404398 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=true.cz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=LGyj1PS0; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=casper.20170209 header.b=Ud2Dx4yQ; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cdq4X1Rb9z9sSs for ; Sun, 22 Nov 2020 10:14:36 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=4ku4ZQ0hGVCdIbf95hQCRD+koAJ1dr4YlUOtaJcTvnU=; b=LGyj1PS02nZbuIO96AT5Kb3nOp nFQnf2PqkyNiv+R0emt95qrdZW+Bl1lu2bm+zhSkRHAW+HtTcqs3Iy8n0fGT+Ma38qwtCXOqPF5II VX6sm+r+2cidpTg4WsBy8eqvfXuidCO7JL7VeCvm78+he2kWFxaxL94FmJ192TNojEqwgVWySFzFQ lRGM5dd4e9utN2jQfxwYKebwaMWEz5H59s0LfbC+RUl9lDQukf9kfcM2klDB94X+5AjpGetCSPY34 TyN2QUVMXBujmtErmMn7TVvApXOD4WZbuJ9nWdgBAhWRkaWe3375v9V9JroyCm9SZ+MS8dKzaNeGV /WkdeB1A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kgc3r-0008Et-E0; Sat, 21 Nov 2020 23:12:55 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kgc3l-0008D2-8g for openwrt-devel@merlin.infradead.org; Sat, 21 Nov 2020 23:12:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:In-Reply-To:References; bh=nUTRjoc3HTi7cR5v5vHx6RkGhWRku2qg7vcVDU7xJ5I=; b=Ud2Dx4yQyKWjP9rJBNcshYEcHG 9lGojDEaWS+/UyRcSyifPf6uONcRKjuMeXMNo6eeSeddmItjITmG3k8n5Y6OlSyeioexw7lFyOREa xlNL7uyD8lOyBZDXqlbXUeyqU3RtKQIpGtR+gkMuQA9Yl99GA8/JUm6+4CURZOj3e7ROUxBMa1SCt bf3WX4gRMkLj7tMOwS3H8jwdlhdCIXefuqEmJbBlQkjXGKKSMchyvGPkJSfRM2Qag0PecdKo72DjO 2ATFu8UhdmpJeaHBwezQAezd5xUhvjXmQqCkiYq3kg/V8o1NTZhLJBDULdnAAkq0a3h1VPM4hXSfb 0/xJP/lw==; Received: from smtp-out.xnet.cz ([178.217.244.18]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kgVvp-0002JP-LA for openwrt-devel@lists.openwrt.org; Sat, 21 Nov 2020 16:40:16 +0000 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id 3A1063C98; Sat, 21 Nov 2020 17:40:09 +0100 (CET) Received: by meh.true.cz (OpenSMTPD) with ESMTP id 839d8c79; Sat, 21 Nov 2020 17:39:48 +0100 (CET) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/2] toolchain: kernel-headers: fix check target for kernel Git tree Date: Sat, 21 Nov 2020 16:33:40 +0100 Message-Id: <20201121153341.7406-1-ynezz@true.cz> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201121_164014_018497_3B53D91A X-CRM114-Status: UNSURE ( 7.53 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.4 on casper.infradead.org summary: Content analysis details: (-1.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Petr_=C5=A0tetiar?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 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 --- toolchain/kernel-headers/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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)