From patchwork Fri Mar 13 06:21:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 6001981 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7498BBF90F for ; Fri, 13 Mar 2015 06:23:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D56C202AE for ; Fri, 13 Mar 2015 06:23:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD26D201BB for ; Fri, 13 Mar 2015 06:23:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751825AbbCMGXS (ORCPT ); Fri, 13 Mar 2015 02:23:18 -0400 Received: from conuserg009.nifty.com ([202.248.44.35]:58022 "EHLO conuserg009-v.nifty.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752038AbbCMGWc (ORCPT ); Fri, 13 Mar 2015 02:22:32 -0400 Received: from beagle.diag.org (KD036010032014.au-net.ne.jp [36.10.32.14]) (authenticated) by conuserg009-v.nifty.com with ESMTP id t2D6Ln9i018725; Fri, 13 Mar 2015 15:22:00 +0900 X-Nifty-SrcIP: [36.10.32.14] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Josh Boyer , Darren Hart , john stultz , Michal Marek , Josh Triplett , Masahiro Yamada , linux-kernel@vger.kernel.org, "Yann E. MORIN" Subject: [PATCH 3/6] kbuild: mergeconfig: remove redundant $(objtree) Date: Fri, 13 Mar 2015 15:21:40 +0900 Message-Id: <1426227703-31815-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426227703-31815-1-git-send-email-yamada.masahiro@socionext.com> References: <1426227703-31815-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Kbuild always runs in $(objtree). Actually, $(objtree) is always set to "." by the top-level Makefile. We can omit "-O $(objtree)" and "$(objtree)/". Signed-off-by: Masahiro Yamada --- scripts/kconfig/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index be0fad4..b0e4be2 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -108,7 +108,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(S define mergeconfig $(if $(call configfiles,$(1)),, $(error No configuration exists for this target on this architecture)) -$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(call configfiles,$(1)) +$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(call configfiles,$(1)) +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig endef