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 | |
| 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>
| -rw-r--r-- | conf/machine/intel-core2-32.conf | 2 | ||||
| -rw-r--r-- | conf/machine/intel-corei7-64.conf | 2 | ||||
| -rw-r--r-- | wic/grub-bootdisk-microcode.wks.in (renamed from wic/grub-bootdisk-microcode.wks) | 2 | ||||
| -rw-r--r-- | wic/systemd-bootdisk-microcode.wks.in (renamed from wic/systemd-bootdisk-microcode.wks) | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index 570685aa..d99dc783 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf | |||
| @@ -33,5 +33,5 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyPCH0" | |||
| 33 | APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" | 33 | APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" |
| 34 | 34 | ||
| 35 | IMAGE_FSTYPES += "wic" | 35 | IMAGE_FSTYPES += "wic" |
| 36 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks", "grub-bootdisk-microcode.wks", d)}" | 36 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}" |
| 37 | WKS_FILE_DEPENDS_append = " intel-microcode" | 37 | WKS_FILE_DEPENDS_append = " intel-microcode" |
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" |
diff --git a/wic/grub-bootdisk-microcode.wks b/wic/grub-bootdisk-microcode.wks.in index 7eda3766..d83b1dfb 100644 --- a/wic/grub-bootdisk-microcode.wks +++ b/wic/grub-bootdisk-microcode.wks.in | |||
| @@ -9,4 +9,4 @@ part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 | |||
| 9 | 9 | ||
| 10 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid | 10 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid |
| 11 | 11 | ||
| 12 | bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0" | 12 | bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 ${APPEND}" |
diff --git a/wic/systemd-bootdisk-microcode.wks b/wic/systemd-bootdisk-microcode.wks.in index c171fd8e..03528950 100644 --- a/wic/systemd-bootdisk-microcode.wks +++ b/wic/systemd-bootdisk-microcode.wks.in | |||
| @@ -10,4 +10,4 @@ part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 | |||
| 10 | 10 | ||
| 11 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid | 11 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid |
| 12 | 12 | ||
| 13 | bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0" | 13 | bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 ${APPEND}" |