Browse Source

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>
pyro-old
Ed Bartosh 5 years ago
committed by Richard Purdie
parent
commit
64a379b325
  1. 4
      meta-selftest/recipes-test/images/wic-image-minimal.bb
  2. 3
      meta-selftest/recipes-test/images/wic-image-minimal.wks

4
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

3
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"

Loading…
Cancel
Save