From patchwork Thu May 19 06:52:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 68091 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp3032688qge; Wed, 18 May 2016 23:52:50 -0700 (PDT) X-Received: by 10.194.165.226 with SMTP id zb2mr12467865wjb.172.1463640770735; Wed, 18 May 2016 23:52:50 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id z203si16368749wmg.85.2016.05.18.23.52.50; Wed, 18 May 2016 23:52:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 06C6FA763F; Thu, 19 May 2016 08:52:32 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B2EWBKEv0Xpg; Thu, 19 May 2016 08:52:31 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 28F94A75C2; Thu, 19 May 2016 08:51:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5F7D2A74F1 for ; Thu, 19 May 2016 08:51:31 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vAZmaXWF6nAs for ; Thu, 19 May 2016 08:51:31 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-12.nifty.com (conuserg-12.nifty.com [210.131.2.79]) by theia.denx.de (Postfix) with ESMTPS id 3305CA74FB for ; Thu, 19 May 2016 08:51:29 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id u4J6p2Zp001067; Thu, 19 May 2016 15:51:11 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com u4J6p2Zp001067 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1463640672; bh=EyjS4pFE/hBUpeASu4XrY3uuBI9iGg618S4HtJEWCFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z6zQ6mSR0d4uUSUchuob+3HmGKvN4L3M7V/+zTgnhdQ2A1tKawsn/s6NpwVtj7AQT l0j9zDHJyssJn6tZbK4YBYhbhJHCqgjon01mXcpROHLB4Q6sd9zLG8VpuPM4vJZJKI 5M7yM2PVaJOPwmUMbCNspBeJHkf/3nP7tFewta5a0qrJftDGtM0c0YKs3w/5S3Helv ZjuNHBHBJNVAbnTeIHnVSr2txVSwFpzcWYDDiqPw4+gR7VYZmlajBoEkT/VnI2kGkk R0zLKJzHuJtfapekRwLzlsVvB/Ku/6X9shaQ4Qa9lhUX224g8Rsp3XwObfICksQIU4 nDijI3TC5TmBA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Thu, 19 May 2016 15:52:00 +0900 Message-Id: <1463640729-25666-13-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1463640729-25666-1-git-send-email-yamada.masahiro@socionext.com> References: <1463640729-25666-1-git-send-email-yamada.masahiro@socionext.com> Cc: Joe Hershberger Subject: [U-Boot] [PATCH 12/21] tools: moveconfig: compute file paths just once X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The paths to .config, include/autoconf.mk, include/config/auto.conf are not changed during the defconfig walk. Compute them only once when a new class instance is created. Signed-off-by: Masahiro Yamada --- tools/moveconfig.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/tools/moveconfig.py b/tools/moveconfig.py index b509f49..9f38a08 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -428,7 +428,10 @@ class KconfigParser: self.configs = configs self.options = options self.progress = progress - self.build_dir = build_dir + self.dotconfig = os.path.join(build_dir, '.config') + self.autoconf = os.path.join(build_dir, 'include', 'autoconf.mk') + self.config_autoconf = os.path.join(build_dir, 'include', 'config', + 'auto.conf') def get_cross_compile(self): """Parse .config file and return CROSS_COMPILE. @@ -442,8 +445,7 @@ class KconfigParser: """ arch = '' cpu = '' - dotconfig = os.path.join(self.build_dir, '.config') - for line in open(dotconfig): + for line in open(self.dotconfig): m = self.re_arch.match(line) if m: arch = m.group(1) @@ -520,14 +522,12 @@ class KconfigParser: defconfig: defconfig name. """ - dotconfig_path = os.path.join(self.build_dir, '.config') - autoconf_path = os.path.join(self.build_dir, 'include', 'autoconf.mk') results = [] - with open(dotconfig_path) as f: + with open(self.dotconfig) as f: dotconfig_lines = f.readlines() - with open(autoconf_path) as f: + with open(self.autoconf) as f: autoconf_lines = f.readlines() for config in self.configs: @@ -558,13 +558,13 @@ class KconfigParser: print log, self.progress.show() - with open(dotconfig_path, 'a') as f: + with open(self.dotconfig, 'a') as f: for (action, value) in results: if action == ACTION_MOVE: f.write(value + '\n') - os.remove(os.path.join(self.build_dir, 'include', 'config', 'auto.conf')) - os.remove(autoconf_path) + os.remove(self.config_autoconf) + os.remove(self.autoconf) class Slot: