diff options
| author | Chee Yang Lee <chee.yang.lee@intel.com> | 2019-12-03 13:35:58 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-15 09:08:43 +0000 |
| commit | 3925515d989993146a72214db6796dde4b18ecd7 (patch) | |
| tree | 860f93c1e1ac5ef8ace20cce54f695352ea0f1df /meta-yocto-bsp/conf/machine | |
| parent | 766dfbdfb8fe727013cc66032475462b326691e8 (diff) | |
| download | poky-3925515d989993146a72214db6796dde4b18ecd7.tar.gz | |
genericx86: wic wks do not hardcode loader
replace .wks with .wks.in and refer loader to EFI_PROVIDER
to enable different bootloader.
soft assign default EFI_PROVIDER "grub-efi" for genericx86.
(From meta-yocto rev: 11ecd2febed95e923c8cc68e2c438cd846a88d02)
Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/conf/machine')
| -rw-r--r-- | meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 3 |
1 files changed, 2 insertions, 1 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" |