diff options
Diffstat (limited to 'meta-yocto-bsp')
-rw-r--r-- | meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 3 | ||||
-rw-r--r-- | meta-yocto-bsp/wic/genericx86.wks.in (renamed from meta-yocto-bsp/wic/genericx86.wks) | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index f83ce5c594..a6c396c79e 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc | |||
@@ -20,6 +20,7 @@ GLIBC_ADDONS = "nptl" | |||
20 | EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" | 20 | EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" |
21 | 21 | ||
22 | IMAGE_FSTYPES += "wic wic.bmap" | 22 | IMAGE_FSTYPES += "wic wic.bmap" |
23 | WKS_FILE ?= "genericx86.wks" | 23 | WKS_FILE ?= "genericx86.wks.in" |
24 | EFI_PROVIDER ??= "grub-efi" | ||
24 | do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" | 25 | do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" |
25 | do_image_wic[recrdeptask] += "do_bootimg" | 26 | do_image_wic[recrdeptask] += "do_bootimg" |
diff --git a/meta-yocto-bsp/wic/genericx86.wks b/meta-yocto-bsp/wic/genericx86.wks.in index dab719c584..7c09ad00a1 100644 --- a/meta-yocto-bsp/wic/genericx86.wks +++ b/meta-yocto-bsp/wic/genericx86.wks.in | |||
@@ -1,6 +1,6 @@ | |||
1 | # short-description: Create an EFI disk image for genericx86* | 1 | # short-description: Create an EFI disk image for genericx86* |
2 | # long-description: Creates a partitioned EFI disk image for genericx86* machines | 2 | # long-description: Creates a partitioned EFI disk image for genericx86* machines |
3 | part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --ondisk sda --label msdos --active --align 1024 | 3 | part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --ondisk sda --label msdos --active --align 1024 |
4 | part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid | 4 | part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid |
5 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap | 5 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap |
6 | 6 | ||