From: Alistair Francis Date: Thu, 3 Nov 2016 00:17:16 +0000 (-0700) Subject: runqemu: Split out the base name of QB_DEFAULT_KERNEL X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~23627 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c0fdfa1316011b856a795d8e42c36ac8b5638b2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Ross Burton --- diff --git a/scripts/runqemu b/scripts/runqemu index 6952f3210b5..af254234df9 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)