summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-16 22:42:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-23 12:05:17 +0000
commit168f62e427a0e7f02d6ed1b20d6992cb049a097c (patch)
tree03b80332c64b1c6f75691567e3e351742ca0d4d3 /meta
parenta79b32c75af78c602d1822dc2d60f24b74fc549c (diff)
downloadpoky-168f62e427a0e7f02d6ed1b20d6992cb049a097c.tar.gz
wic: fix getting path of native sysroot
wic used STAGING_DIR_NATIVE variable as a path to native sysroot. This doesn't work with recipe specific sysroots as STAGING_DIR_NATIVE points to the native sysroot of the current recipe. Used RECIPE_SYSROOT_NATIVE variable of wic-tools recipe to fix the issue. (From OE-Core rev: de9d7d14cd03e4dfc5812890a53c79b706b56537) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/wic.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index e45594fdc8..77f1bdcfa9 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -210,12 +210,12 @@ class Wic(oeSelfTest):
210 def test_build_artifacts(self): 210 def test_build_artifacts(self):
211 """Test wic create directdisk providing all artifacts.""" 211 """Test wic create directdisk providing all artifacts."""
212 bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) 212 bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal'))
213 for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', 213 for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', 'IMAGE_ROOTFS'))
214 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS')) 214 bbvars['recipe_sysroot_native'] = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
215 status = runCmd("wic create directdisk " 215 status = runCmd("wic create directdisk "
216 "-b %(staging_datadir)s " 216 "-b %(staging_datadir)s "
217 "-k %(deploy_dir_image)s " 217 "-k %(deploy_dir_image)s "
218 "-n %(staging_dir_native)s " 218 "-n %(recipe_sysroot_native)s "
219 "-r %(image_rootfs)s" % bbvars).status 219 "-r %(image_rootfs)s" % bbvars).status
220 self.assertEqual(0, status) 220 self.assertEqual(0, status)
221 self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) 221 self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
@@ -301,13 +301,13 @@ class Wic(oeSelfTest):
301 def test_rootfs_artifacts(self): 301 def test_rootfs_artifacts(self):
302 """Test usage of rootfs plugin with rootfs paths""" 302 """Test usage of rootfs plugin with rootfs paths"""
303 bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) 303 bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal'))
304 for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', 304 for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', 'IMAGE_ROOTFS'))
305 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS')) 305 bbvars['recipe_sysroot_native'] = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
306 bbvars['wks'] = "directdisk-multi-rootfs" 306 bbvars['wks'] = "directdisk-multi-rootfs"
307 status = runCmd("wic create %(wks)s " 307 status = runCmd("wic create %(wks)s "
308 "--bootimg-dir=%(staging_datadir)s " 308 "--bootimg-dir=%(staging_datadir)s "
309 "--kernel-dir=%(deploy_dir_image)s " 309 "--kernel-dir=%(deploy_dir_image)s "
310 "--native-sysroot=%(staging_dir_native)s " 310 "--native-sysroot=%(recipe_sysroot_native)s "
311 "--rootfs-dir rootfs1=%(image_rootfs)s " 311 "--rootfs-dir rootfs1=%(image_rootfs)s "
312 "--rootfs-dir rootfs2=%(image_rootfs)s" 312 "--rootfs-dir rootfs2=%(image_rootfs)s"
313 % bbvars).status 313 % bbvars).status