Skip to contentSkip to conversation

wic-image-minimal: stop using core-image-minimal

PATCH In review Ed Bartosh 2 participants 2 messages Apr 11, 2017

lore
Share & tools
lore

Ed Bartosh

author
#0 lore raw

PATCH 1/1 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.

---
 meta-selftest/recipes-test/images/wic-image-minimal.bb  | 4 ----
 meta-selftest/recipes-test/images/wic-image-minimal.wks | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)
meta-selftest/recipes-test/images/wic-image-minimal.bb +0 -4
index 9594697..e1da203 100644
@@ -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
meta-selftest/recipes-test/images/wic-image-minimal.wks +1 -2
index 3e08cf4..9410b68 100644
@@ -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"
Signature · 1 line
2.1.4
#1 lore raw

✗ patchtest: failure for wic-image-minimal: stop using core-image-minimal

== Series Details ==

Series: wic-image-minimal: stop using core-image-minimal
Revision: 1
URL : https://patchwork.openembedded.org/series/6302/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 210c518ba8)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe