From patchwork Mon Aug 25 16:01:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 382794 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 2F9C0140110 for ; Tue, 26 Aug 2014 02:04:38 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 771834B634; Mon, 25 Aug 2014 18:04:03 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 lo7g9VhJjKox; Mon, 25 Aug 2014 18:04:03 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2055EA7431; Mon, 25 Aug 2014 18:02:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 70A434B372 for ; Mon, 25 Aug 2014 18:02:25 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 njbzS1nmrmB2 for ; Mon, 25 Aug 2014 18:02:22 +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 mail-pd0-f202.google.com (mail-pd0-f202.google.com [209.85.192.202]) by theia.denx.de (Postfix) with ESMTPS id 3C52D4B617 for ; Mon, 25 Aug 2014 18:02:09 +0200 (CEST) Received: by mail-pd0-f202.google.com with SMTP id w10so3568352pde.1 for ; Mon, 25 Aug 2014 09:02:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ndBenO+3ITIQOJ8kIHo2ZrM2INbXrPpNr35skZUx3E0=; b=iLC/3Zqkcc9ebK/kfzD9XmN4OE4f0ZuYGddKLxJGkaMbzyOLqw6R+qHo6kwY2kz2Ix ajGro45BDanQTXdndmBT8x/1ZPK4zXHe93lLwHo+wFolEV90NUUWxFhomW98F/enuxf+ MhgfcZ5scxSATFixl1R9goQA1gqDhkhINGOU/3RCUzL60wuEjaaADvu1vKU/WDZmRmJ6 bHcccKphDkm10A4iolBangTiVN/+5u1KrS9wMBIpcT8bbss7emmXCjRwqbIDJ9J1WWB2 2/UpX8+gXi5v7Gy7l2rEiS1SF4PH5L0AdHlpNss81qJhwsDfWj1b1JXuXWXNZvmE83kS rgrg== X-Gm-Message-State: ALoCoQkBCFZooB72RbrvR0TNOavyNtrAN8CS8GgFtdrcSy9Oz4IC0q60o86rfA6LjWAPXvIx1y/a X-Received: by 10.67.5.228 with SMTP id cp4mr14433206pad.8.1408982527698; Mon, 25 Aug 2014 09:02:07 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id d7si19406yho.2.2014.08.25.09.02.07 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Aug 2014 09:02:07 -0700 (PDT) Received: from kaki.bld.corp.google.com (kaki.bld.corp.google.com [172.29.216.32]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id F2DDA5A4195; Mon, 25 Aug 2014 09:02:06 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 958522209A6; Mon, 25 Aug 2014 10:02:06 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 25 Aug 2014 10:01:14 -0600 Message-Id: <1408982481-19722-10-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1408982481-19722-1-git-send-email-sjg@chromium.org> References: <1408982481-19722-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH 09/15] buildman: Set up bsettings outside the control module X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Move the bsettings code back to the main buildman.py file, so we can do something different when testing. Signed-off-by: Simon Glass --- tools/buildman/buildman.py | 2 ++ tools/buildman/control.py | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py index 6771c86..d0afeda 100755 --- a/tools/buildman/buildman.py +++ b/tools/buildman/buildman.py @@ -19,6 +19,7 @@ sys.path.append(os.path.join(our_path, '../patman')) # Our modules import board +import bsettings import builder import checkpatch import cmdline @@ -59,5 +60,6 @@ if options.test: # Build selected commits for selected boards else: + bsettings.Setup(options.config_file) ret_code = control.DoBuildman(options, args) sys.exit(ret_code) diff --git a/tools/buildman/control.py b/tools/buildman/control.py index b35eb41..a27f7db 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -101,7 +101,6 @@ def DoBuildman(options, args, toolchains=None, make_func=None): gitutil.Setup() - bsettings.Setup(options.config_file) options.git_dir = os.path.join(options.git, '.git') if not toolchains: