From patchwork Thu May 17 06:16:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136110 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1882950lji; Wed, 16 May 2018 23:25:56 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpv8GkJ+lXAG+Wo6gX9WNi26kTx4tARDyQflMu+s7PUm/288F0SefcGEp99zS+OerDt50N2 X-Received: by 2002:a17:902:24a5:: with SMTP id w34-v6mr3979473pla.52.1526538356771; Wed, 16 May 2018 23:25:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526538356; cv=none; d=google.com; s=arc-20160816; b=VcXl9MT2UlWTSU+k7LPTQIfzNidpd4pByOVQKMzlIHVjeLqSpbx8Ai0OBxeVTOtIT/ lTmIVBKrhn5+DIhJf4IJvkuieHx8QrPo2UO8+gk3OBH9634ej5kukHAhLN/dTqdWD5nE IoYhtOcBSBMWVhC1QWK0QtPIvI9Pz7CytXVEDHOR37jFRTlenHZZd6BCQhlyfYFwfLC5 guu97XW9X45CbD66w6QC1IbX4yAlXKztRzllxdo/rzRWhc126sCQFtj12qw6CNz3u/rd tDYxV1Ays9FJ0WEAxpArWIVNPZcGQhVMVZsLqnnWb1BSyVsCy7iz3ZsHe4dQuQGGExHJ vsDQ== 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=v8EKEXrkHLNulLEGAKsvHmqv+vu2knhxmGZZax3Ioac=; b=F3yQszw2ukEcB6sjfEj/KUjdhxfMvUTwhlXPC8jOGicPLeOopSDAbBe/nZcOLTEuQ4 HC+G1TafV0+fFsAN2TEG/TDfsU4e4Qy0slnmFdJiSTol3YZGZ8Zvos5ZW7GPzstwwH9E bymnG/FTHSO5OtRjS5JMZHzqRmYAJKBFEl/lgfUZZqwujYjBxrX8c7HeXUXt6PnY/MH9 L+OuufrOlM9hUmJuo5IFnKgzLq18BCQcQqSgx/JCuzyKFVocD4GgUS/j9XRUn1N0DLAp LFpbbn9t9Wpp3fUO/Ke05HyYQcpDAQ13p3G3ASkjIjMjslz2YuGjgz0RNjwtOgOoVIRI flhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=WpkNSsKj; 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 j17-v6si3509005pgv.395.2018.05.16.23.25.56; Wed, 16 May 2018 23:25:56 -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=WpkNSsKj; 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 S1752089AbeEQGTJ (ORCPT + 29 others); Thu, 17 May 2018 02:19:09 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:24366 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751850AbeEQGS4 (ORCPT ); Thu, 17 May 2018 02:18:56 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w4H6HbU7002841; Thu, 17 May 2018 15:17:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w4H6HbU7002841 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1526537867; bh=v8EKEXrkHLNulLEGAKsvHmqv+vu2knhxmGZZax3Ioac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WpkNSsKjvhiwoC9k5UsCyZoy+CgGS4uk9UZ0F8i3GZb2JIxPQ+3fHIPQDkypBR6+t S0oI3Mbncgfd72TIffFETeQdFNkI+HnLDR3ojEwIJreMtpmzzeCwDZVAANTtR1fztj sd8X9o7h+eF+QWcQUzgSvJQ8pQkaFAkl0f7QdtfwsI/tXc0e7WhsDrV7nccLmARVju HZXsYeuAt2bcILuO4KAIpQIA2EZ3TLFCU/84dpDmB1N4bwJNncCh4uyVFzbvRXpVkW lAPLgyzRqWQpCSwpPyaduilN/X7cvm8eakmm9ca2NwhdbhvB8KemF9ehpPPkHZE84T 2dqdJDflfZn8g== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Linus Torvalds , Sam Ravnborg , Ulf Magnusson , "Luis R . Rodriguez" , linux-kernel@vger.kernel.org, Nicholas Piggin , Kees Cook , Emese Revfy , x86@kernel.org, Masahiro Yamada Subject: [PATCH v4 09/31] kconfig: replace $(UNAME_RELEASE) with function call Date: Thu, 17 May 2018 15:16:48 +0900 Message-Id: <1526537830-22606-10-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526537830-22606-1-git-send-email-yamada.masahiro@socionext.com> References: <1526537830-22606-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 v4: None 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 c6278e6..01b2211 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 752816b..66f0463 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"