From patchwork Fri Feb 16 18:38:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 128624 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp869852ljc; Fri, 16 Feb 2018 10:48:34 -0800 (PST) X-Google-Smtp-Source: AH8x226u0gAfoBdOj59SMaaUXgN5Jjxn0EtPFP2ArHrsmG7/xazXsdTL1Ns8Pn/W1NS9DVMozMx4 X-Received: by 10.98.7.214 with SMTP id 83mr6878907pfh.130.1518806914626; Fri, 16 Feb 2018 10:48:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518806914; cv=none; d=google.com; s=arc-20160816; b=KIkwnHAT0FnTImyb2G9vOPqR1N2MklcmGKTOPzoboM0DAWFd9A5f8dB+SoiT7Mr4TE fVgc1jmMRoS+j59Zts7LqTKFA4FttkDoL3X26lp+z+WT260ElOkgB0WLsYdQhDq/GX2v +fdeMEu7ZDcoSjUKJp+YprOdt9MKID+GYSdIoAR7MJ93R2VDy9bwXr/cod2X20fxo8+w o0VSENNp+1zDVwo/qG4W5AzhlpdvmHAn5vqRF/0yPm+fFE/cI5x7TtC4U8RCGe5KmKzU B4ucEoUaGjjD1K1hV9YseR20Ygaq1zx2vkHuasgJqB84BSj+EX93zwfUisizkxAjaTeB InzA== 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=uohe4JbWTsHxXCz7M2tIVXCUW+oWNRx1k6t+Og+uw9s=; b=QHtuRO+qYWd0hnqM6KLrn4i9NKgKg0AvPi7vNzMQuay98/vGFJ9/oUi+n5OknLppy5 h3rROhaQFpi0ZzgPUVQJ4R7MrJzlQILCYCJqHIgBaflwgjMuKXcE5DlJujyw2pXHRgno W8N44mKkezPSjuQSHmeWV2BPN4US3t6W9/RJEE6I8CGjQfgkwvjoRIwGSby4fUEBXe7F jt8Lq5C/kwamYdJGMLiNbAGg41fnuKijIGSFcZ7WD3F3h1m6CitOoIMZgW0tncRhrZVp Mbbq59ajYJohduOIRWgBG17lCFswDSZUX4PMUxGlE/vZ/BNUY9MV2vOUAgBD+i0UPol5 FWHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=xEiTufgI; 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 p33-v6si2408561pld.310.2018.02.16.10.48.34; Fri, 16 Feb 2018 10:48:34 -0800 (PST) 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=xEiTufgI; 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 S1752442AbeBPSsJ (ORCPT + 28 others); Fri, 16 Feb 2018 13:48:09 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:57761 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752633AbeBPSlS (ORCPT ); Fri, 16 Feb 2018 13:41:18 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-07.nifty.com with ESMTP id w1GIdBTF013418; Sat, 17 Feb 2018 03:39:24 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com w1GIdBTF013418 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1518806364; bh=uohe4JbWTsHxXCz7M2tIVXCUW+oWNRx1k6t+Og+uw9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xEiTufgINRL5SPe22riEdAN2jhTl058etg5OcI0tVtrpYonAT02vBjEgG0TB+7HzF kf6oJQZx8OUxPUaOJ38K9/2kBoB7SnonuVT1nyI0yh17PSM9eoJYUCH2vuMg+Aa/78 fawYXVbJoNQ+9/rKEq7DpYoru7PwxkXo7BjENhguAa3+Ig7PPWVlccxvgMB8e1dTI9 okPMppBlio4V7s4tg4L43IIa0szXEpstSDOQeWcLYvzz1GkyZcMdXoRHbcqAmqaM+H 6VFmgyfrkXAgyoW0oPsVJWe7kCVgndlRyYN0jHOPnurxf2HWJWiebsZnnacJ2YOs5u Ni2zxsnovEmBA== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org, Linus Torvalds Cc: Greg Kroah-Hartman , Arnd Bergmann , Kees Cook , Randy Dunlap , Ulf Magnusson , Sam Ravnborg , Michal Marek , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 12/23] kconfig: replace $UNAME_RELEASE with function call Date: Sat, 17 Feb 2018 03:38:40 +0900 Message-Id: <1518806331-7101-13-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518806331-7101-1-git-send-email-yamada.masahiro@socionext.com> References: <1518806331-7101-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 With 'shell-stdout' supported, we can make it self-contained in Kconfig. Signed-off-by: Masahiro Yamada --- Makefile | 3 +-- init/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index e9fc7c9..6491404 100644 --- a/Makefile +++ b/Makefile @@ -275,8 +275,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 f026a62..837a584 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-stdout uname --release)/.config" default "/etc/kernel-config" - default "/boot/config-$UNAME_RELEASE" + default "/boot/config-$(shell-stdout uname --release)" default ARCH_DEFCONFIG default "arch/$ARCH/defconfig"