From patchwork Thu Aug 29 13:26:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel] cookerdata: Set TOPDIR when using bblayers.conf From: Richard Purdie X-Patchwork-Id: 56871 Message-Id: <1377782813.1059.0.camel@ted> To: bitbake-devel Date: Thu, 29 Aug 2013 14:26:53 +0100 By definition, bblayers.conf is at the top of the build tree. We'd like to support running bitbake anywhere within that build tree but TOPDIR gets set to wherever cwd is. Change the code to reset TOPDIR to the top of the build directory. This shouldn't break anything but does make the system more usable. Signed-off-by: Richard Purdie diff --git a/bitbake/lib/bb/ b/bitbake/lib/bb/ index a0379cf..8a0bc22 100644 --- a/bitbake/lib/bb/ +++ b/bitbake/lib/bb/ @@ -239,6 +239,9 @@ class CookerDataBuilder(object): layerconf = self._findLayerConf() if layerconf: parselog.debug(2, "Found bblayers.conf (%s)", layerconf) + # By definition bblayers.conf is in conf/ of TOPDIR. + # We may have been called with cwd somewhere else so reset TOPDIR + data.setVar("TOPDIR", os.path.dirname(os.path.dirname(layerconf))) data = parse_config_file(layerconf, data) layers = (data.getVar('BBLAYERS', True) or "").split()