From 74d7d12b3760d0b149538c0c08cddb0e3db3b012 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 5 Apr 2017 23:41:37 -0700 Subject: 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 Signed-off-by: Richard Purdie --- scripts/runqemu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/runqemu') 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) -- cgit v1.2.3-54-g00ecf