From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 4BE19E00C28; Thu, 12 Nov 2015 04:38:42 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high * trust * [134.134.136.65 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id E8A8DE00C32 for ; Thu, 12 Nov 2015 04:38:21 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 12 Nov 2015 04:38:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,281,1444719600"; d="scan'208";a="818169920" Received: from linux.intel.com ([10.23.219.25]) by orsmga001.jf.intel.com with ESMTP; 12 Nov 2015 04:38:22 -0800 Received: from vmed.fi.intel.com (vmed.fi.intel.com [10.237.72.51]) by linux.intel.com (Postfix) with ESMTP id E3B656A4083 for ; Thu, 12 Nov 2015 04:37:16 -0800 (PST) From: Ed Bartosh To: toaster@yoctoproject.org Date: Thu, 12 Nov 2015 14:04:37 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 14/26] toaster: remove _setupBE function X-BeenThere: toaster@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Web based interface for BitBake List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2015 12:38:42 -0000 This function is not needed as build environment is always created because of the new way to run Toaster. It can be only sourced after oe-init-build-env is sourced. Signed-off-by: Ed Bartosh --- .../lib/toaster/bldcontrol/localhostbecontroller.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index b5cf559..9a3c818 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py @@ -71,17 +71,6 @@ class LocalhostBEController(BuildEnvironmentController): logger.debug("localhostbecontroller: shellcmd success") return out - def _setupBE(self): - assert self.pokydirname and os.path.exists(self.pokydirname) - path = self.be.builddir - if not path: - raise Exception("Invalid path creation specified.") - if not os.path.exists(path): - os.makedirs(path, 0755) - self._shellcmd("bash -c \"source %s/oe-init-build-env %s\"" % (self.pokydirname, path)) - # delete the templateconf.cfg; it may come from an unsupported layer configuration - os.remove(os.path.join(path, "conf/templateconf.cfg")) - def writeConfFile(self, file_name, variable_list = None, raw = None): filepath = os.path.join(self.be.builddir, file_name) @@ -290,16 +279,12 @@ class LocalhostBEController(BuildEnvironmentController): logger.debug("localhostbecontroller: current layer list %s " % pformat(layerlist)) - # 4. configure the build environment, so we have a conf/bblayers.conf - assert self.pokydirname is not None - self._setupBE() - - # 5. update the bblayers.conf + # 4. update the bblayers.conf bblayerconf = os.path.join(self.be.builddir, "conf/bblayers.conf") if not os.path.exists(bblayerconf): raise BuildSetupException("BE is not consistent: bblayers.conf file missing at %s" % bblayerconf) - # 6. create custom layer and add custom recipes to it + # 5. create custom layer and add custom recipes to it layerpath = os.path.join(self.be.sourcedir, "_meta-toaster-custom") if os.path.isdir(layerpath): shutil.rmtree(layerpath) # remove leftovers from previous builds -- 2.1.4