From patchwork Mon May 28 09:21:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 137063 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp2596160lji; Mon, 28 May 2018 02:29:56 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrzeJqOIHx7GFSgPaPw7TJs3N17IYp0a8txyukGUw4TcRpY0AUShggTK1zXnA8AU+QgxEFo X-Received: by 2002:a62:cf43:: with SMTP id b64-v6mr12649729pfg.248.1527499795974; Mon, 28 May 2018 02:29:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527499795; cv=none; d=google.com; s=arc-20160816; b=gKTxERmCdW50WtTEvauMY4qlnyivNEPqC6Ghjn93t/bJqmtDWZyo9RkeKrcS3Wmidp /4MaDI9wtvugZSZ4ZmdDZMYH1hKfWRgJGcziIGRWlZJzJbIdH7CKFFEQc1Wdtx37Ra77 GUbGE6Hob8LxJZ6Lbb3G39/lMIBT0WehbzVlQgwfZHK3m+3XYS0oQIuJ7uG6JhXOT82e 7ArTYunghiW+dapNZZ2Z/VNo+JSK5Fkdha8S9IczGzLjZDo+x7G8T+vANOlkL2X81jyJ XJ7tIPBs5i18wLVJS97IVGNrKjt/cACYDmD+etVWKXEJKfesFyL8+4fP4TF663TXgBSc YVeQ== 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=vYpPTJhorXn/ORx73YlODbDL6sHt3PicU6+i4bEs6rA=; b=nlAkFm5FlwC1Hgtwmd8SYmHEnUwgoPeBuHvdvqt1w0LXFwFa0UQOvSBAmiyQ/kMKb4 mVZev235Dcs5MC+sEoxoEk8+08/N8aCNO3KD8zhXP9r+n52JR1zWmnmB/YRJMu0LSek6 4HODrPj/duIsI7YE1UChYwLbfz+QFE6KCghVV097Y6KymZA3KtbTLa4ay5/2Y3DPTztG cuBOYdkpRaYUgELLyigQAbgz4lrZ9s+sWaA0InAPf1o3YC5+nw/MSD0UuYudrK5eoGjo RpgAxLPw+3DWy6ceXqWC8DFLdy0d7ChGFu/amEVdxC7ccNbgAAX8E6ApHehz54i1Y/km AWdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=12XxOej3; 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 h66-v6si7945061pgc.53.2018.05.28.02.29.55; Mon, 28 May 2018 02:29:55 -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=12XxOej3; 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 S1754496AbeE1J3x (ORCPT + 30 others); Mon, 28 May 2018 05:29:53 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:21616 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754321AbeE1JYQ (ORCPT ); Mon, 28 May 2018 05:24:16 -0400 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-10.nifty.com with ESMTP id w4S9MInR027506; Mon, 28 May 2018 18:22:27 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w4S9MInR027506 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1527499347; bh=vYpPTJhorXn/ORx73YlODbDL6sHt3PicU6+i4bEs6rA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=12XxOej3dbTj3agnHnvUM1rg7MXqScTGkJrrgJh7mtrZvVVgIMhEF524/HqLgtw6R zF7ewfl6qtdmIdvyIQHEGuqaZuAX1G//erY+4GdYSjTVlYVOFXsMwgQ+xyf46vxTr4 hzKVnauMbYhOj0+gWv+Bsj06l4L1+xnVY6tjg4TbQWTzcNK19Vd6KRJRogdorlKZzQ ifyOabUtSrnlspgcCw+0VXg8XnS5WzTx18htaYTrdOD/4uTjlQm5s4ND5tZt+mBWWe 4e/AuQNHuzYxBomwy3ohdxyZOzp5fATQlPyVdQFZ+OQyeZvSMr/2Ym1XqBhUAeGguj ba7E4N1rS+aiQ== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Kees Cook , Nicholas Piggin , "Luis R . Rodriguez" , Randy Dunlap , Ulf Magnusson , Sam Ravnborg , Linus Torvalds , Masahiro Yamada Subject: [PATCH v5 10/31] kconfig: replace $(UNAME_RELEASE) with function call Date: Mon, 28 May 2018 18:21:47 +0900 Message-Id: <1527499328-13213-11-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527499328-13213-1-git-send-email-yamada.masahiro@socionext.com> References: <1527499328-13213-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 v5: None 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 59b8654..58afa07 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 1217fc6..f1b0cfb 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"