mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

classes/image: don't chdir when creating symlinks

Browse Source 
There's no need to chdir() when creating image symlinks, and using chdir()
changes the state for future tasks.

(From OE-Core rev: 2fdf06fbe986d742f6bb13e9348b50e9aab03139)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2016-06-13 20:05:18 +01:00
committed by Richard Purdie
parent 4e1a1040af
commit 6f7a3dc284
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/image.bbclass
+2 -3
View File
@@ -519,14 +519,13 @@ python create_symlinks() {
taskname = d.getVar("BB_CURRENTTASK", True) taskname = d.getVar("BB_CURRENTTASK", True)
subimages = (d.getVarFlag("do_" + taskname, 'subimages', False) or "").split() subimages = (d.getVarFlag("do_" + taskname, 'subimages', False) or "").split()
imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix', True) or d.expand("${IMAGE_NAME_SUFFIX}.") imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix', True) or d.expand("${IMAGE_NAME_SUFFIX}.")
os.chdir(deploy_dir)
if not link_name: if not link_name:
return return
for type in subimages: for type in subimages:
dst = deploy_dir + "/" + link_name + "." + type dst = os.path.join(deploy_dir, link_name + "." + type)
src = img_name + imgsuffix + 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)) bb.note("Creating symlink: %s -> %s" % (dst, src))
if os.path.islink(dst): if os.path.islink(dst):
if d.getVar('RM_OLD_IMAGE', True) == "1" and \ if d.getVar('RM_OLD_IMAGE', True) == "1" and \