summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-02-13 11:02:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-15 16:28:44 +0000
commit4b2660144d6aecd99d29f444ffd6af178ca71d04 (patch)
tree547ea122d1cd8fbaefbc4870cc2a3d6a69bb67fa
parentf799e218ed21572376c18fbe29f5dce0ab19fffc (diff)
downloadpoky-4b2660144d6aecd99d29f444ffd6af178ca71d04.tar.gz
wic-image-minimal: change IMAGE_FSTYPES
Replaced wic.bz2 -> wic in the recipe. Replaced wic.bz2 -> wic in oe-selftest test case. wic-image-minimal is going to be booted in qemu and tested. As runqemu doesn't support compressed images this recipe needs to produce raw wic image. (From OE-Core rev: 3ce91db94f4b921566dce0dc6f91a422009be06b) (From OE-Core rev: 69d8dfe4fc1fec440e33b1bb6cef62e20f1f5c28) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-selftest/recipes-test/images/wic-image-minimal.bb2
-rw-r--r--meta/lib/oeqa/selftest/wic.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.bb b/meta-selftest/recipes-test/images/wic-image-minimal.bb
index 95c7a9b89a..ced22c822a 100644
--- a/meta-selftest/recipes-test/images/wic-image-minimal.bb
+++ b/meta-selftest/recipes-test/images/wic-image-minimal.bb
@@ -4,7 +4,7 @@ SRC_URI = "file://${FILE_DIRNAME}/${BPN}.wks"
4 4
5IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" 5IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}"
6 6
7IMAGE_FSTYPES = "wic.bz2" 7IMAGE_FSTYPES = "wic"
8RM_OLD_IMAGE = "1" 8RM_OLD_IMAGE = "1"
9 9
10DEPENDS = "syslinux syslinux-native parted-native dosfstools-native mtools-native" 10DEPENDS = "syslinux syslinux-native parted-native dosfstools-native mtools-native"
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index df826ed84b..a739f69b2e 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -228,7 +228,7 @@ class Wic(oeSelfTest):
228 prefix = os.path.join(deploy_dir, 'wic-image-minimal-%s.' % machine) 228 prefix = os.path.join(deploy_dir, 'wic-image-minimal-%s.' % machine)
229 # check if we have result image and manifests symlinks 229 # check if we have result image and manifests symlinks
230 # pointing to existing files 230 # pointing to existing files
231 for suffix in ('wic.bz2', 'manifest'): 231 for suffix in ('wic', 'manifest'):
232 path = prefix + suffix 232 path = prefix + suffix
233 self.assertTrue(os.path.islink(path)) 233 self.assertTrue(os.path.islink(path))
234 self.assertTrue(os.path.isfile(os.path.realpath(path))) 234 self.assertTrue(os.path.isfile(os.path.realpath(path)))