diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-04-05 23:41:37 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-07 00:47:48 +0100 |
commit | dad9f27278850d0d3818344fea877835632576cb (patch) | |
tree | b23c88f07749c2d9938288c42eddd5c36c50de01 /scripts | |
parent | a6152dd9f6f4e17855548ceffa8d864855a67f5c (diff) | |
download | openembedded-core-dad9f27278850d0d3818344fea877835632576cb.tar.gz openembedded-core-dad9f27278850d0d3818344fea877835632576cb.tar.bz2 openembedded-core-dad9f27278850d0d3818344fea877835632576cb.zip |
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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/runqemu | 4 |
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): # artefacts are relative to that file, rather than in whatever # directory DEPLOY_DIR_IMAGE in the conf file points to. if self.qbconfload: - imgdir = os.path.dirname(self.qemuboot) - if imgdir != self.get('DEPLOY_DIR_IMAGE'): + imgdir = os.path.realpath(os.path.dirname(self.qemuboot)) + if imgdir != os.path.realpath(self.get('DEPLOY_DIR_IMAGE')): logger.info('Setting DEPLOY_DIR_IMAGE to folder containing %s (%s)' % (self.qemuboot, imgdir)) self.set('DEPLOY_DIR_IMAGE', imgdir) |