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:04:04 +0100 |
| commit | 0f1879982ab6006f14ac2c9f5546a7b1f79460cd (patch) | |
| tree | 9533f78e580f3918dc9e41298c6b54952ab2eac7 /meta-selftest/recipes-test | |
| parent | 0e8528f7c6201e8a5d2799123241c0e1b85081ce (diff) | |
| download | openembedded-core-0f1879982ab6006f14ac2c9f5546a7b1f79460cd.tar.gz openembedded-core-0f1879982ab6006f14ac2c9f5546a7b1f79460cd.tar.bz2 openembedded-core-0f1879982ab6006f14ac2c9f5546a7b1f79460cd.zip | |
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.
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 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -# core-image-minimal is referenced in .wks, so we need its rootfs -# to be ready before our rootfs -do_rootfs[depends] += "core-image-minimal:do_image core-image-minimal:do_rootfs_wicenv" - IMAGE_ROOTFS_EXTRA_SPACE = "2000" 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 @@ part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid -part /mnt --source rootfs --rootfs-dir=core-image-minimal --ondisk sda --fstype=ext4 --label core --align 1024 -part backup --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext4 --label backup --align 1024 +part /mnt --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext4 --label core --align 1024 bootloader --ptable gpt --timeout=0 --append="rootwait console=tty0" |