summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@xilinx.com>2016-11-02 17:17:16 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-15 15:19:53 +0000
commit1cb4fdef89304d5888a971a6a9e3177b6be6b73c (patch)
treeb0855c53a74d05ea5178f6de3efac5a9ad813ede /scripts/runqemu
parent7a932424cab787dde6a6787bdadd9b1162fd4500 (diff)
downloadpoky-1cb4fdef89304d5888a971a6a9e3177b6be6b73c.tar.gz
runqemu: Split out the base name of QB_DEFAULT_KERNEL
The function write_qemuboot_conf() in qemuboot.bbclass always inserts the full path into QB_DEFAULT_KERNEL. Remove this path before using the variable. (From OE-Core rev: 7c0fdfa1316011b856a795d8e42c36ac8b5638b2) Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-xscripts/runqemu5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 6952f3210b..af254234df 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -478,9 +478,12 @@ class BaseConfig(object):
478 if self.fstype in self.vmtypes: 478 if self.fstype in self.vmtypes:
479 return 479 return
480 480
481 # QB_DEFAULT_KERNEL is always a full file path
482 kernel_name = os.path.basename(self.get('QB_DEFAULT_KERNEL'))
483
481 deploy_dir_image = self.get('DEPLOY_DIR_IMAGE') 484 deploy_dir_image = self.get('DEPLOY_DIR_IMAGE')
482 if not self.kernel: 485 if not self.kernel:
483 kernel_match_name = "%s/%s" % (deploy_dir_image, self.get('QB_DEFAULT_KERNEL')) 486 kernel_match_name = "%s/%s" % (deploy_dir_image, kernel_name)
484 kernel_match_link = "%s/%s" % (deploy_dir_image, self.get('KERNEL_IMAGETYPE')) 487 kernel_match_link = "%s/%s" % (deploy_dir_image, self.get('KERNEL_IMAGETYPE'))
485 kernel_startswith = "%s/%s*" % (deploy_dir_image, self.get('KERNEL_IMAGETYPE')) 488 kernel_startswith = "%s/%s*" % (deploy_dir_image, self.get('KERNEL_IMAGETYPE'))
486 cmds = (kernel_match_name, kernel_match_link, kernel_startswith) 489 cmds = (kernel_match_name, kernel_match_link, kernel_startswith)