summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-04-05 23:41:37 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-10 23:00:42 +0100
commit74d7d12b3760d0b149538c0c08cddb0e3db3b012 (patch)
treeaea0022442116719e14818b38c5823006b6d710f /scripts
parentc70a74402f174a3a214f63762ca481bcbad1525c (diff)
downloadpoky-74d7d12b3760d0b149538c0c08cddb0e3db3b012.tar.gz
runqemu: use realpath for imgdir
The DEPLOY_DIR_IMAGE maybe relative or absolute path since it can be read from env vars, so use realpath for both imgdir and DEPLOY_DIR_IMAGE when compare. (From OE-Core rev: dad9f27278850d0d3818344fea877835632576cb) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 251f5f7e94..b696202871 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -693,8 +693,8 @@ class BaseConfig(object):
693 # artefacts are relative to that file, rather than in whatever 693 # artefacts are relative to that file, rather than in whatever
694 # directory DEPLOY_DIR_IMAGE in the conf file points to. 694 # directory DEPLOY_DIR_IMAGE in the conf file points to.
695 if self.qbconfload: 695 if self.qbconfload:
696 imgdir = os.path.dirname(self.qemuboot) 696 imgdir = os.path.realpath(os.path.dirname(self.qemuboot))
697 if imgdir != self.get('DEPLOY_DIR_IMAGE'): 697 if imgdir != os.path.realpath(self.get('DEPLOY_DIR_IMAGE')):
698 logger.info('Setting DEPLOY_DIR_IMAGE to folder containing %s (%s)' % (self.qemuboot, imgdir)) 698 logger.info('Setting DEPLOY_DIR_IMAGE to folder containing %s (%s)' % (self.qemuboot, imgdir))
699 self.set('DEPLOY_DIR_IMAGE', imgdir) 699 self.set('DEPLOY_DIR_IMAGE', imgdir)
700 700