From patchwork Sun Jun 18 21:27:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 777507 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wrS0q5JSSz9s3T for ; Mon, 19 Jun 2017 07:29:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="c/SdtCoO"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date: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=x6a5xvzuDs4DaoqF3lR9NU+KShiV6V8B0bLQzoisxck=; b=c/SdtCoOQONgc6 OVH55Jb/UBRd9vSNxJUvkLZ/AtGfMGSfM9Etn0rM8r4lpPhlpTkAFD7uw4OhOHRpPzvR8PUmPvu0X ABUgC0XnHYph2emdqiEocsZ1AYIiohW1NT7YrvtRZ3oip3bYwh2m/RyucQvxgI2ZMopnNIcd6JMSg WVor2y+QU+UMoA0S2E8T81vru/9LEBmJeVsN5jcKvx4Vj5wFnU+XclMiQqk6gQZsWegWnKKK0BwgW qaQAkXGnj7tsslR4hjMIcbPyGMTEZMN4+PGer9xuzxX3WulM9np517kk0oqoRtbZvhftZtLcfQ2+f t4DT1CHa+P1fBhuyIwoA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dMhkX-0004Su-Bd; Sun, 18 Jun 2017 21:28:49 +0000 Received: from hauke-m.de ([5.39.93.123] helo=mail.hauke-m.de) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dMhk7-0004Rv-HU for lede-dev@lists.infradead.org; Sun, 18 Jun 2017 21:28:25 +0000 Received: from hauke-desktop.lan (p200300862834C30055BD85C311B5F1A2.dip0.t-ipconnect.de [IPv6:2003:86:2834:c300:55bd:85c3:11b5:f1a2]) by mail.hauke-m.de (Postfix) with ESMTPSA id 9B3B21001DD; Sun, 18 Jun 2017 23:27:57 +0200 (CEST) From: Hauke Mehrtens To: lede-dev@lists.infradead.org Date: Sun, 18 Jun 2017 23:27:51 +0200 Message-Id: <20170618212751.4171-1-hauke@hauke-m.de> X-Mailer: git-send-email 2.11.0 X-Spam-Status: No, score=0.0 required=7.0 tests=UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on hauke-m.de X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170618_142823_743111_8847E85A X-CRM114-Status: UNSURE ( 7.13 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH] build: Fix not altering KERNELRELEASE for external kernel X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hauke Mehrtens , f.fainelli@gmail.com, nbd@nbd.name MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org When an external kernel tree is used the version should not get modified by the LEDE build scripts. This was added by Florian some time ago. The commit 0aed054becb21439 ("build: add KERNEL_MAKE and KERNEL_MAKE_FLAGS variables and move to kernel.mk") breaks this feature introduced in b6746a6ffb73 ("include: Do not alter KERNELRELEASE for external/git kernels"). Signed-off-by: Hauke Mehrtens Acked-by: Florian Fainelli --- include/kernel.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/kernel.mk b/include/kernel.mk index 464c94572e..7674f0dadc 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -108,11 +108,10 @@ KERNEL_MAKE_FLAGS := \ CONFIG_SHELL="$(BASH)" \ $(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') \ $(if $(PKG_BUILD_ID),LDFLAGS_MODULE=--build-id=0x$(PKG_BUILD_ID)) \ - KERNELRELEASE=$(LINUX_VERSION) \ cmd_syscalls= ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),) - KERNEL_MAKEOPTS += \ + KERNEL_MAKE_FLAGS += \ KERNELRELEASE=$(LINUX_VERSION) endif