diff options
| -rw-r--r-- | bin/oe/parse/ConfHandler.py | 2 | ||||
| -rw-r--r-- | bin/oebuild | 12 | ||||
| -rw-r--r-- | doc/TODO | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/bin/oe/parse/ConfHandler.py b/bin/oe/parse/ConfHandler.py index 7fc2d0288..399f50eeb 100644 --- a/bin/oe/parse/ConfHandler.py +++ b/bin/oe/parse/ConfHandler.py @@ -25,7 +25,9 @@ def init(data): # directories oe.data.setVarFlag("TOPDIR", "warnlevel", "3", data) + oe.data.setVarFlag("TOPDIR", "inherit", "1", data) oe.data.setVarFlag("TMPDIR", "warnlevel", "3", data) + oe.data.setVarFlag("TMPDIR", "inherit", "1", data) oe.data.setVarFlag("DL_DIR", "warnlevel", "3", data) oe.data.setVarFlag("OEDIR", "inherit", "1", data) oe.data.setVarFlag("OEDIR", "warnlevel", "3", data) diff --git a/bin/oebuild b/bin/oebuild index 72c87d86e..beeeae41f 100644 --- a/bin/oebuild +++ b/bin/oebuild @@ -56,20 +56,24 @@ def get_cmd(): def load_oefile(oefile, cfgdata): oepath = data.getVar('OEPATH', cfg) - topdir = os.path.abspath(os.getcwd()) + topdir = data.getVar('TOPDIR', cfg) + if not topdir: + topdir = os.path.abspath(os.getcwd()) + # set topdir to here + data.setVar('TOPDIR', topdir, cfg) + oefile = os.path.abspath(oefile) oefile_loc = os.path.abspath(os.path.dirname(oefile)) - # set topdir to here - data.setVar('TOPDIR', topdir, cfg) # expand tmpdir to include this topdir data.setVar('TMPDIR', data.getVar('TMPDIR', cfg, 1) or "", cfg) # add topdir to oepath oepath += ":%s" % topdir # set topdir to location of .oe file topdir = oefile_loc - data.setVar('TOPDIR', topdir, cfg) + #data.setVar('TOPDIR', topdir, cfg) # add that topdir to oepath oepath += ":%s" % topdir # go there + print "chdiring to %s" % topdir os.chdir(topdir) data.setVar('OEPATH', oepath, cfg) from copy import copy @@ -43,7 +43,7 @@ TODO: [x] Allow execution with .oe, without command [x] Default .oe argument for oemake [x] Allow specifying a command on oemake execution - [ ] Must be able to execute 'oemake' within a subpackage + [x] Must be able to execute 'oemake' within a subpackage of an upstream package, and yet retain access to the toplevel TMPDIR. Perhaps specify TMPDIR through the environment. |