summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-06-13 20:05:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 18:09:47 +0100
commit2fdf06fbe986d742f6bb13e9348b50e9aab03139 (patch)
tree81f1de39ce75fc009c17636d6a77c871ce06984a
parenteae1717e500e5637cabb829e1b487f955491efaf (diff)
downloadopenembedded-core-contrib-2fdf06fbe986d742f6bb13e9348b50e9aab03139.tar.gz
openembedded-core-contrib-2fdf06fbe986d742f6bb13e9348b50e9aab03139.tar.bz2
openembedded-core-contrib-2fdf06fbe986d742f6bb13e9348b50e9aab03139.zip
classes/image: don't chdir when creating symlinks
There's no need to chdir() when creating image symlinks, and using chdir() changes the state for future tasks. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2577cca733..61295f4bd7 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -519,14 +519,13 @@ python create_symlinks() {
taskname = d.getVar("BB_CURRENTTASK", True)
subimages = (d.getVarFlag("do_" + taskname, 'subimages', False) or "").split()
imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix', True) or d.expand("${IMAGE_NAME_SUFFIX}.")
- os.chdir(deploy_dir)
if not link_name:
return
for type in subimages:
- dst = deploy_dir + "/" + link_name + "." + type
+ dst = os.path.join(deploy_dir, link_name + "." + type)
src = img_name + imgsuffix + type
- if os.path.exists(src):
+ if os.path.exists(os.path.join(deploy_dir, src)):
bb.note("Creating symlink: %s -> %s" % (dst, src))
if os.path.islink(dst):
if d.getVar('RM_OLD_IMAGE', True) == "1" and \