diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-02-13 11:02:19 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-15 16:28:44 +0000 |
| commit | 9b6dc9b07e8eb53b4783abf2b9189081ae6bcf5d (patch) | |
| tree | ed26e31ba94ce8bb5da19dafcac986a549924ca6 | |
| parent | ab7cb65ab574ab1bb99057b7cbe442fe5a14a9f8 (diff) | |
| download | poky-9b6dc9b07e8eb53b4783abf2b9189081ae6bcf5d.tar.gz | |
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 <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 | ||||
| -rw-r--r-- | meta-selftest/recipes-test/images/wic-image-minimal.wks | 4 |
2 files changed, 3 insertions, 3 deletions
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}" | |||
| 7 | IMAGE_FSTYPES = "wic" | 7 | IMAGE_FSTYPES = "wic" |
| 8 | RM_OLD_IMAGE = "1" | 8 | RM_OLD_IMAGE = "1" |
| 9 | 9 | ||
| 10 | DEPENDS = "syslinux syslinux-native parted-native dosfstools-native mtools-native" | 10 | DEPENDS = "syslinux syslinux-native parted-native dosfstools-native mtools-native gptfdisk-native" |
| 11 | 11 | ||
| 12 | # core-image-minimal is referenced in .wks, so we need its rootfs | 12 | # core-image-minimal is referenced in .wks, so we need its rootfs |
| 13 | # to be ready before our rootfs | 13 | # 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 @@ | |||
| 3 | # created from core-image-minimal and wic-image-minimal image recipes. | 3 | # created from core-image-minimal and wic-image-minimal image recipes. |
| 4 | 4 | ||
| 5 | part /boot --source bootimg-pcbios --ondisk vda --label boot --active --align 1024 | 5 | part /boot --source bootimg-pcbios --ondisk vda --label boot --active --align 1024 |
| 6 | part / --source rootfs --ondisk vda --fstype=ext4 --label platform --align 1024 | 6 | part / --source rootfs --ondisk vda --fstype=ext4 --label platform --align 1024 --use-uuid |
| 7 | part /mnt --source rootfs --rootfs-dir=core-image-minimal --ondisk vda --fstype=ext4 --label core --align 1024 | 7 | part /mnt --source rootfs --rootfs-dir=core-image-minimal --ondisk vda --fstype=ext4 --label core --align 1024 |
| 8 | part backup --source rootfs --rootfs-dir=wic-image-minimal --ondisk vda --fstype=ext4 --label backup --align 1024 | 8 | part backup --source rootfs --rootfs-dir=wic-image-minimal --ondisk vda --fstype=ext4 --label backup --align 1024 |
| 9 | 9 | ||
| 10 | bootloader --timeout=0 --append="rootwait console=tty0 root=/dev/vda2" | 10 | bootloader --ptable gpt --timeout=0 --append="rootwait console=tty0" |