From patchwork Tue Mar 27 05:29:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132457 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp4656389ljb; Mon, 26 Mar 2018 22:36:35 -0700 (PDT) X-Google-Smtp-Source: AG47ELuczegvLzYyBHn6pVPX7wDtNZy83q0v4U0woV8VSaYy7aEUf7uxRww/zMDe11FMFV77+HE+ X-Received: by 10.99.127.9 with SMTP id a9mr12096076pgd.168.1522128995742; Mon, 26 Mar 2018 22:36:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522128995; cv=none; d=google.com; s=arc-20160816; b=sKDSJYwRokzzwx4/8E50jKrr/Zxc6muDTXktCbdhgrOpWT4ripMkC3/OUR8WJ3Y2U9 v0+og994w8FKLi2y6B1d9sc3m47GVf82EUk992dM0mZyKpa1prdRc6LWiblUaRsFXnW3 P6iOd7yyG+g4dp/WQb3hyOZeaMHlWrNnAVaGvbIZEjJOjIgEtg7VwlK9ix2g4LcDdl9y qw5hr1WRT1gjsewvn86tx/JNcU0BR1pBhBZYOTi1H/699CNDqCX5pfD584HK2YTQaU0U eGM419jRUZe2wkvoDc/O+qERX4cgiHpYpNeOt15T22xfnOMP/OXUj6PRgRtajbDTXmEI yZ3g== 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=J2BgIXcZwp3hlOWfk/Pju/0FbwUbeEepiJU9WiBDX5g=; b=dXk0BGI9wOKrbdKVYFpDbIB3+ZAAbFVTTqC/HxnlCPAh2/S020LhdRHjZOQQOrbkn2 Fc38cUBjmtRIVHZgwy3e0wXvgc5drDaQxWLDauRwVCQm6yQuvBWCL33Pblqas4Nip5f4 QQ/rzGI4meyGz/y6etK9GZaLjog+abz0SuHHxjqOsYuANAa7Z0G6dGS3H73JrWuBKgmZ SEmbMybaSRRQam/2cRlFgywW1WIGvpKB/Qk9XuhULfeAO6qZFI892a9ufkQuKqx0lXC7 er+okdzAqXACOERwSMDiiDZUzglZMeRFi9zwCUYxvWc3ezfyyOaTZQNWwa89CoUKiV6f RBCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=yAGX2yST; 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 r3si363813pgf.125.2018.03.26.22.36.35; Mon, 26 Mar 2018 22:36: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=yAGX2yST; 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 S1752580AbeC0Fgb (ORCPT + 28 others); Tue, 27 Mar 2018 01:36:31 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:44619 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751896AbeC0FcA (ORCPT ); Tue, 27 Mar 2018 01:32:00 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w2R5TaLr011947; Tue, 27 Mar 2018 14:29:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w2R5TaLr011947 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1522128587; bh=J2BgIXcZwp3hlOWfk/Pju/0FbwUbeEepiJU9WiBDX5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yAGX2ySTEJZavEU+/sXQsyLR4Ca49lVjQT5FDCKikq3rv3FkvSm4jmiLWpSCTKgFd O8Hlo7efOt9Qa1XIFS5q3x6cZuI0NDaVUiYYSMio1Ulpgj66MoxuFxKDG7gLL/xzQe dvO+0Fx6ewQIJ20pRFURHtIox+zxIhrbCogF74P3P/DzHxn3UBSDYMB263m+H4yaWO 3CImLwl4kTNe0f120F7B238elzhxy1AaMdVEYrRw4iPWeXyk6kLk1UfAJdJ7NRDwA7 CLBbbB+Gn9+mo7zo92uLh1WyQ3PCeeiaL+8GzAUlewtNCX+GWJQHsG5tQtHCOqTXDD xabGpC/SL6XSQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Linus Torvalds , Arnd Bergmann , Ulf Magnusson , Kees Cook , Thomas Gleixner , Greg Kroah-Hartman , Randy Dunlap , "Luis R . Rodriguez" , Nicolas Pitre , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 08/21] kconfig: replace $UNAME_RELEASE with function call Date: Tue, 27 Mar 2018 14:29:22 +0900 Message-Id: <1522128575-5326-9-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522128575-5326-1-git-send-email-yamada.masahiro@socionext.com> References: <1522128575-5326-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 --- Changes in v2: None Makefile | 3 +-- init/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.7.4 Reviewed-by: Kees Cook Reviewed-by: Ulf Magnusson diff --git a/Makefile b/Makefile index 4ae1486..5c395ed 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 b4814e6..0d6fe20 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"