diff options
author | Ross Burton <ross.burton@intel.com> | 2019-03-04 21:13:30 +0000 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2019-03-07 09:47:19 +0800 |
commit | b5a428bc6be7e1c02ca7d0714e0a5d25f31b4a5f (patch) | |
tree | d3812b48eac123d19b221d6d95d3b650d3b07028 /conf/machine/intel-corei7-64.conf | |
parent | a0f0731eaa0112217c1bad63cb935d4c2283bd35 (diff) | |
download | meta-intel-b5a428bc6be7e1c02ca7d0714e0a5d25f31b4a5f.tar.gz |
wic: pass APPEND to bootloader
Rename the systemd and grub-efi .wks files to .wks.in, and replace all 'append'
entries apart from rootfstype (which is specific to the wks file) with
${APPEND}, so the values of APPEND from the BSP and user is respected.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'conf/machine/intel-corei7-64.conf')
-rw-r--r-- | conf/machine/intel-corei7-64.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index fd0900dc..197546f7 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf | |||
@@ -36,5 +36,5 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2" | |||
36 | APPEND += "rootwait console=ttyS0,115200 console=tty0" | 36 | APPEND += "rootwait console=ttyS0,115200 console=tty0" |
37 | 37 | ||
38 | IMAGE_FSTYPES += "wic" | 38 | IMAGE_FSTYPES += "wic" |
39 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks", "grub-bootdisk-microcode.wks", d)}" | 39 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}" |
40 | WKS_FILE_DEPENDS_append = " intel-microcode" | 40 | WKS_FILE_DEPENDS_append = " intel-microcode" |