From patchwork Fri Apr 13 05:06:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 133312 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp344257ljb; Thu, 12 Apr 2018 22:08:35 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/3JRTaI2/Jt7cnwQ5iRa2EExkIpObvGDGqch7Pj0RiCTSfMoIVsvv2SWMAHVGnNl3D6cIO X-Received: by 10.101.70.72 with SMTP id k8mr2845584pgr.402.1523596115091; Thu, 12 Apr 2018 22:08:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523596115; cv=none; d=google.com; s=arc-20160816; b=sn6+hQkKPQ7zvrEVYktNMOvC+6PydzLPRkoCypaBh9mCBnUNSUF7lCg2IDDl63dkLa xbbV5lBQZyQX4zVkHUFiU59tbr2HXMaCss9r+VFaPGoyhevqD9OXX+VsWdh+Q5fnaf3N vRKXKFKbIfnEop4P9ZYCUeZ/4w73WJEqKwxxujwYtQzYbK7TAwXMp3FIi5P86/puZqY2 Xh9H4JWwESzTjbOzzWeoyV6NDL1cNZx0M0Qf1WUfGtaMoFr124+/ZpDvrNrudYZx+E5g 7APtQVViaTdqUCVM0KeMM6AUC/VediBft+4mJjNnVx55wjDy7Cq5bzHVa5IN22yHwsKe 7cUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=dgPuQuvAnYcI8SIWEi6+4oaT6Am/yO+BkCMNL1AoPuM=; b=pHEeW0Wvee88Nfx3nBZO830gIbdEmJPrlF9LuG430uZ3VmzfUlt0nUHAT9/kAsL33A QhTlvivP/H9gsnMBxl5cAJj2YVXFGlI0gefM8UmwF+Q2+fjFxTai7bHvwnKMWh8ubb+o R83BLtZlK3k7iSzbSI8VWCawj/Zana9Pa9LXZBqA2zORgWVGipmwQ3a/twgV0bHyeD7D A/bOrdk61Q8kx4rd5oWsQnZQACX36NRkMZ33rKkC2Uqrog3YNYPCyEzTGfcErJaj9p7W JlMWoXzVL+jSglMvQgzESdlg/qdHuM0QC/6agPO017WtDY3iJvTObo+uUUM43rTP9uUP BLLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=UK9P8nPX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i129si3280749pgd.206.2018.04.12.22.08.34; Thu, 12 Apr 2018 22:08:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=UK9P8nPX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752186AbeDMFIY (ORCPT + 29 others); Fri, 13 Apr 2018 01:08:24 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:54461 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750885AbeDMFIP (ORCPT ); Fri, 13 Apr 2018 01:08:15 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id w3D56lg4029209; Fri, 13 Apr 2018 14:06:56 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com w3D56lg4029209 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1523596017; bh=dgPuQuvAnYcI8SIWEi6+4oaT6Am/yO+BkCMNL1AoPuM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UK9P8nPXAOnN826BpWTV2j95aOSQGrI57OlE6JJwFOqos7eWli5R99lN9k9QshYS1 pmAbBsK08EO1btVgORuNiciqzfk6q/2dKljQV/KZBraYeCntg1xMqjZU4NfI1ZobnK 8rDVNupB6gqhILij0eQO7Jpm4v2kpPVCxF8Dea2JA5c+VmodniW8Uc0NTHjjiRVU0r 4T4EkCUHItK8IO+fjfiPMPInqs6QQTm27yW/T0Ut/lWFvtmjtuMhPadMEHsa/OxGya QGl1wdQXDunhuL4qb0LJ4vqhmUQu32TSX5HHjK4BlZXO+OeaMCwDA00mkvUQztba/H AJDwPVl/QBq/A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Linus Torvalds , Sam Ravnborg , Ulf Magnusson , Nicholas Piggin , Kees Cook , Emese Revfy , x86@kernel.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 10/30] kconfig: replace $(UNAME_RELEASE) with function call Date: Fri, 13 Apr 2018 14:06:19 +0900 Message-Id: <1523595999-27433-11-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523595999-27433-1-git-send-email-yamada.masahiro@socionext.com> References: <1523595999-27433-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that 'shell' function is supported, this can be self-contained in Kconfig. Signed-off-by: Masahiro Yamada Reviewed-by: Kees Cook Reviewed-by: Ulf Magnusson --- Changes in v3: None Changes in v2: None Makefile | 3 +-- init/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index 5298ad7..ca3e3e8 100644 --- a/Makefile +++ b/Makefile @@ -284,8 +284,7 @@ include scripts/Kbuild.include # Read KERNELRELEASE from include/config/kernel.release (if it exists) KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) -UNAME_RELEASE := $(shell uname --release) -export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION UNAME_RELEASE +export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION # SUBARCH tells the usermode build what the underlying arch is. That is set # first, and if a usermode build is happening, the "ARCH=um" on the command diff --git a/init/Kconfig b/init/Kconfig index e6dafed5..4b0b636 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -2,9 +2,9 @@ config DEFCONFIG_LIST string depends on !UML option defconfig_list - default "/lib/modules/$(UNAME_RELEASE)/.config" + default "/lib/modules/$(shell uname --release)/.config" default "/etc/kernel-config" - default "/boot/config-$(UNAME_RELEASE)" + default "/boot/config-$(shell uname --release)" default ARCH_DEFCONFIG default "arch/$(ARCH)/defconfig"