[oe-commits] [openembedded-core] 20/50: runqemu: Split out the base name of QB_DEFAULT_KERNEL

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 7c0fdfa1316011b856a795d8e42c36ac8b5638b2
Author: Alistair Francis <alistair.francis at xilinx.com>
AuthorDate: 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.
    
    Signed-off-by: Alistair Francis <alistair.francis at xilinx.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/runqemu | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.