summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/qemuboot.bbclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
index 7243cc5257..15a9e63f2b 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -85,7 +85,8 @@ python do_write_qemuboot_conf() {
85 85
86 qemuboot = "%s/%s.qemuboot.conf" % (d.getVar('IMGDEPLOYDIR'), d.getVar('IMAGE_NAME')) 86 qemuboot = "%s/%s.qemuboot.conf" % (d.getVar('IMGDEPLOYDIR'), d.getVar('IMAGE_NAME'))
87 qemuboot_link = "%s/%s.qemuboot.conf" % (d.getVar('IMGDEPLOYDIR'), d.getVar('IMAGE_LINK_NAME')) 87 qemuboot_link = "%s/%s.qemuboot.conf" % (d.getVar('IMGDEPLOYDIR'), d.getVar('IMAGE_LINK_NAME'))
88 topdir="%s/"%(d.getVar('TOPDIR')).replace("//","/") 88 finalpath = d.getVar("DEPLOY_DIR_IMAGE")
89 topdir = d.getVar('TOPDIR')
89 cf = configparser.ConfigParser() 90 cf = configparser.ConfigParser()
90 cf.add_section('config_bsp') 91 cf.add_section('config_bsp')
91 for k in sorted(qemuboot_vars(d)): 92 for k in sorted(qemuboot_vars(d)):
@@ -98,7 +99,8 @@ python do_write_qemuboot_conf() {
98 val = d.getVar(k) 99 val = d.getVar(k)
99 # we only want to write out relative paths so that we can relocate images 100 # we only want to write out relative paths so that we can relocate images
100 # and still run them 101 # and still run them
101 val=val.replace(topdir,"") 102 if val.startswith(topdir):
103 val = os.path.relpath(val, finalpath)
102 cf.set('config_bsp', k, '%s' % val) 104 cf.set('config_bsp', k, '%s' % val)
103 105
104 # QB_DEFAULT_KERNEL's value of KERNEL_IMAGETYPE is the name of a symlink 106 # QB_DEFAULT_KERNEL's value of KERNEL_IMAGETYPE is the name of a symlink
@@ -108,7 +110,7 @@ python do_write_qemuboot_conf() {
108 kernel = os.path.realpath(kernel_link) 110 kernel = os.path.realpath(kernel_link)
109 # we only want to write out relative paths so that we can relocate images 111 # we only want to write out relative paths so that we can relocate images
110 # and still run them 112 # and still run them
111 kernel=kernel.replace(topdir,"") 113 kernel = os.path.relpath(kernel, finalpath)
112 cf.set('config_bsp', 'QB_DEFAULT_KERNEL', kernel) 114 cf.set('config_bsp', 'QB_DEFAULT_KERNEL', kernel)
113 115
114 bb.utils.mkdirhier(os.path.dirname(qemuboot)) 116 bb.utils.mkdirhier(os.path.dirname(qemuboot))