diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-16 22:42:29 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-23 12:03:51 +0000 |
| commit | de9d7d14cd03e4dfc5812890a53c79b706b56537 (patch) | |
| tree | 5e208824e8ca728fc9a104b4f0ce56c7d8188649 | |
| parent | 52ce14d5ea667ffd319fdb3e147b6eb29505cf8e (diff) | |
| download | openembedded-core-contrib-de9d7d14cd03e4dfc5812890a53c79b706b56537.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.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
| -rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 12 | ||||
| -rwxr-xr-x | scripts/wic | 3 |
2 files changed, 7 insertions, 8 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): def test_build_artifacts(self): """Test wic create directdisk providing all artifacts.""" bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) - for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', - 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS')) + for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', 'IMAGE_ROOTFS')) + bbvars['recipe_sysroot_native'] = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') status = runCmd("wic create directdisk " "-b %(staging_datadir)s " "-k %(deploy_dir_image)s " - "-n %(staging_dir_native)s " + "-n %(recipe_sysroot_native)s " "-r %(image_rootfs)s" % bbvars).status self.assertEqual(0, status) self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) @@ -301,13 +301,13 @@ class Wic(oeSelfTest): def test_rootfs_artifacts(self): """Test usage of rootfs plugin with rootfs paths""" bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) - for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', - 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS')) + for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', 'IMAGE_ROOTFS')) + bbvars['recipe_sysroot_native'] = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') bbvars['wks'] = "directdisk-multi-rootfs" status = runCmd("wic create %(wks)s " "--bootimg-dir=%(staging_datadir)s " "--kernel-dir=%(deploy_dir_image)s " - "--native-sysroot=%(staging_dir_native)s " + "--native-sysroot=%(recipe_sysroot_native)s " "--rootfs-dir rootfs1=%(image_rootfs)s " "--rootfs-dir rootfs2=%(image_rootfs)s" % bbvars).status diff --git a/scripts/wic b/scripts/wic index 1ad16665e7..f09dbc2e00 100755 --- a/scripts/wic +++ b/scripts/wic @@ -175,8 +175,7 @@ def wic_create_subcommand(args, usage_str): rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", options.image_name) kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE", options.image_name) - native_sysroot = get_bitbake_var("STAGING_DIR_NATIVE", - options.image_name) + native_sysroot = os.path.join(get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools")) else: if options.build_rootfs: print("Image name is not specified, exiting. (Use -e/--image-name to specify it)\n") |