diff options
Diffstat (limited to 'meta-selftest/recipes-test/images')
-rw-r--r-- | meta-selftest/recipes-test/images/oe-selftest-image.bb | 3 | ||||
-rw-r--r-- | meta-selftest/recipes-test/images/wic-image-minimal.bb | 12 | ||||
-rw-r--r-- | meta-selftest/recipes-test/images/wic-image-minimal.wks | 8 |
3 files changed, 11 insertions, 12 deletions
diff --git a/meta-selftest/recipes-test/images/oe-selftest-image.bb b/meta-selftest/recipes-test/images/oe-selftest-image.bb index f17094c5d0..317a0712aa 100644 --- a/meta-selftest/recipes-test/images/oe-selftest-image.bb +++ b/meta-selftest/recipes-test/images/oe-selftest-image.bb @@ -1,6 +1,7 @@ SUMMARY = "An image used during oe-selftest tests" -IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} dropbear" +# libudev is needed for deploy mdadm via devtool +IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-ssh-dropbear libudev" IMAGE_FEATURES = "debug-tweaks" IMAGE_LINGUAS = " " diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.bb b/meta-selftest/recipes-test/images/wic-image-minimal.bb index 754689f999..84d3721885 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.bb +++ b/meta-selftest/recipes-test/images/wic-image-minimal.bb @@ -2,19 +2,17 @@ SUMMARY = "An example of partitioned image." SRC_URI = "file://${FILE_DIRNAME}/${BPN}.wks" -IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" +IMAGE_INSTALL = "packagegroup-core-boot" IMAGE_FSTYPES = "wic" -RM_OLD_IMAGE = "1" -DEPENDS = "syslinux syslinux-native parted-native dosfstools-native mtools-native gptfdisk-native" +WKS_FILE_DEPENDS = "dosfstools-native mtools-native gptfdisk-native" +WKS_FILE_DEPENDS:append:x86 = " syslinux-native syslinux" +WKS_FILE_DEPENDS:append:x86-64 = " syslinux-native syslinux" +WKS_FILE_DEPENDS:append:x86-x32 = " syslinux-native syslinux" 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 d55075d503..ae69cb6e3c 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.wks +++ b/meta-selftest/recipes-test/images/wic-image-minimal.wks @@ -2,9 +2,9 @@ # long-description: This image contains boot partition and 3 rootfs partitions # created from core-image-minimal and wic-image-minimal image recipes. -part /boot --source bootimg-pcbios --ondisk vda --label boot --active --align 1024 -part / --source rootfs --ondisk vda --fstype=ext4 --label platform --align 1024 --use-uuid -part /mnt --source rootfs --rootfs-dir=core-image-minimal --ondisk vda --fstype=ext4 --label core --align 1024 -part backup --source rootfs --rootfs-dir=wic-image-minimal --ondisk vda --fstype=ext4 --label backup --align 1024 +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 /media --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext4 --label uuid-test --align 1024 --use-uuid --fsuuid 2c71ef06-a81d-4735-9d3a-379b69c6bdba +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" |