[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3314/8267] runqemu: Split out the base name of QB_DEFAULT_KERNEL
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 3314/8267] runqemu: Split out the base name of QB_DEFAULT_KERNEL
- Date: Sun, 17 Dec 2017 00:27:34 +0000 (UTC)
commit 1cb4fdef89304d5888a971a6a9e3177b6be6b73c
Author: Alistair Francis <alistair francis xilinx com>
Date: Wed Nov 2 17:17:16 2016 -0700
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>
scripts/runqemu | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/scripts/runqemu b/scripts/runqemu
index 6952f32..af25423 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]