summaryrefslogtreecommitdiff
path: root/scripts
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:18:47 +0000
commit7c0fdfa1316011b856a795d8e42c36ac8b5638b2 (patch)
treea5307ec85e0be328036ada54d9cf508f599a67c4 /scripts
parent3694176e13442068acfe54b7165d5f828190fe08 (diff)
downloadopenembedded-core-7c0fdfa1316011b856a795d8e42c36ac8b5638b2.tar.gz
openembedded-core-7c0fdfa1316011b856a795d8e42c36ac8b5638b2.tar.bz2
openembedded-core-7c0fdfa1316011b856a795d8e42c36ac8b5638b2.zip
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. Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
-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):
if self.fstype in self.vmtypes:
return
+ # QB_DEFAULT_KERNEL is always a full file path
+ kernel_name = os.path.basename(self.get('QB_DEFAULT_KERNEL'))
+
deploy_dir_image = self.get('DEPLOY_DIR_IMAGE')
if not self.kernel:
- kernel_match_name = "%s/%s" % (deploy_dir_image, self.get('QB_DEFAULT_KERNEL'))
+ kernel_match_name = "%s/%s" % (deploy_dir_image, kernel_name)
kernel_match_link = "%s/%s" % (deploy_dir_image, self.get('KERNEL_IMAGETYPE'))
kernel_startswith = "%s/%s*" % (deploy_dir_image, self.get('KERNEL_IMAGETYPE'))
cmds = (kernel_match_name, kernel_match_link, kernel_startswith)