diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-04-11 21:11:32 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-12 15:09:58 +0100 |
commit | 64a379b3255929864164eb2a7fe792faf07c06ad (patch) | |
tree | 84a56d7468ac8ee95b3f3b3a8f14b3a18f218346 /meta-selftest/recipes-test | |
parent | 31e53430f1bb6f73b82698b20ef7f1047313214a (diff) | |
download | poky-64a379b3255929864164eb2a7fe792faf07c06ad.tar.gz |
wic-image-minimal: stop using core-image-minimal
Removed dependency to core-image-minimal rootfs from the
recipe and .wks file. This was a bad idea as recipes are
not allowed to use other recipe's rootfs or anything else
from workdir.
This should also fix test_qemu test case when rm_work is
enabled.
(From OE-Core rev: 0f1879982ab6006f14ac2c9f5546a7b1f79460cd)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-selftest/recipes-test')
-rw-r--r-- | meta-selftest/recipes-test/images/wic-image-minimal.bb | 4 | ||||
-rw-r--r-- | meta-selftest/recipes-test/images/wic-image-minimal.wks | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.bb b/meta-selftest/recipes-test/images/wic-image-minimal.bb index 95946971c2..e1da203b59 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.bb +++ b/meta-selftest/recipes-test/images/wic-image-minimal.bb | |||
@@ -10,10 +10,6 @@ WKS_FILE_DEPENDS = "syslinux syslinux-native dosfstools-native mtools-native gpt | |||
10 | 10 | ||
11 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 11 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
12 | 12 | ||
13 | # core-image-minimal is referenced in .wks, so we need its rootfs | ||
14 | # to be ready before our rootfs | ||
15 | do_rootfs[depends] += "core-image-minimal:do_image core-image-minimal:do_rootfs_wicenv" | ||
16 | |||
17 | IMAGE_ROOTFS_EXTRA_SPACE = "2000" | 13 | IMAGE_ROOTFS_EXTRA_SPACE = "2000" |
18 | 14 | ||
19 | inherit image | 15 | inherit image |
diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.wks b/meta-selftest/recipes-test/images/wic-image-minimal.wks index 3e08cf4e43..9410b684be 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.wks +++ b/meta-selftest/recipes-test/images/wic-image-minimal.wks | |||
@@ -4,7 +4,6 @@ | |||
4 | 4 | ||
5 | part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 | 5 | part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 |
6 | part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid | 6 | part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid |
7 | part /mnt --source rootfs --rootfs-dir=core-image-minimal --ondisk sda --fstype=ext4 --label core --align 1024 | 7 | part /mnt --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext4 --label core --align 1024 |
8 | part backup --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext4 --label backup --align 1024 | ||
9 | 8 | ||
10 | bootloader --ptable gpt --timeout=0 --append="rootwait console=tty0" | 9 | bootloader --ptable gpt --timeout=0 --append="rootwait console=tty0" |