From 9b6dc9b07e8eb53b4783abf2b9189081ae6bcf5d Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Sat, 13 Feb 2016 11:02:19 +0200 Subject: wic-image-minimal: use uuid for root partition Used --uuid option to generate PARTUUID for root partion and gpt partition type. As this image is used in runtime testing under qemu it makes sense to ensure that this way of specifying root partition works. Added dependency to gptfdisk-native to wic-image-minimal recipe to be able to create gpt partition table. (From OE-Core rev: ba82867bfda54e86e1de5dc4a6ad7246254cf5c3) (From OE-Core rev: 767d814b2e125e20839f204e17512ebe2aec8b95) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 +- meta-selftest/recipes-test/images/wic-image-minimal.wks | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-selftest') diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.bb b/meta-selftest/recipes-test/images/wic-image-minimal.bb index ced22c822a..9c50ddbbf5 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.bb +++ b/meta-selftest/recipes-test/images/wic-image-minimal.bb @@ -7,7 +7,7 @@ IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" IMAGE_FSTYPES = "wic" RM_OLD_IMAGE = "1" -DEPENDS = "syslinux syslinux-native parted-native dosfstools-native mtools-native" +DEPENDS = "syslinux syslinux-native parted-native dosfstools-native mtools-native gptfdisk-native" # core-image-minimal is referenced in .wks, so we need its rootfs # to be ready before our rootfs diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.wks b/meta-selftest/recipes-test/images/wic-image-minimal.wks index 191244bade..d55075d503 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.wks +++ b/meta-selftest/recipes-test/images/wic-image-minimal.wks @@ -3,8 +3,8 @@ # 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 +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 -bootloader --timeout=0 --append="rootwait console=tty0 root=/dev/vda2" +bootloader --ptable gpt --timeout=0 --append="rootwait console=tty0" -- cgit v1.2.3-54-g00ecf