From b5a428bc6be7e1c02ca7d0714e0a5d25f31b4a5f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 4 Mar 2019 21:13:30 +0000 Subject: 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 Signed-off-by: Anuj Mittal --- conf/machine/intel-core2-32.conf | 2 +- conf/machine/intel-corei7-64.conf | 2 +- wic/grub-bootdisk-microcode.wks | 12 ------------ wic/grub-bootdisk-microcode.wks.in | 12 ++++++++++++ wic/systemd-bootdisk-microcode.wks | 13 ------------- wic/systemd-bootdisk-microcode.wks.in | 13 +++++++++++++ 6 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 wic/grub-bootdisk-microcode.wks create mode 100644 wic/grub-bootdisk-microcode.wks.in delete mode 100644 wic/systemd-bootdisk-microcode.wks create mode 100644 wic/systemd-bootdisk-microcode.wks.in 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" APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" IMAGE_FSTYPES += "wic" -WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks", "grub-bootdisk-microcode.wks", d)}" +WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}" 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" APPEND += "rootwait console=ttyS0,115200 console=tty0" IMAGE_FSTYPES += "wic" -WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks", "grub-bootdisk-microcode.wks", d)}" +WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}" WKS_FILE_DEPENDS_append = " intel-microcode" diff --git a/wic/grub-bootdisk-microcode.wks b/wic/grub-bootdisk-microcode.wks deleted file mode 100644 index 7eda3766..00000000 --- a/wic/grub-bootdisk-microcode.wks +++ /dev/null @@ -1,12 +0,0 @@ -# short-description: Create an EFI disk image with grub-efi -# long-description: Creates a partitioned EFI disk image that the user -# can directly dd to boot media. The selected bootloader is grub-efi. -# It also includes intel-microcode as an initrd for early update support. - -part /boot --source bootimg-efi --sourceparams="loader=grub-efi,initrd=microcode.cpio" --ondisk sda --label msdos --active --align 1024 --use-uuid - -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid - -part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid - -bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0" diff --git a/wic/grub-bootdisk-microcode.wks.in b/wic/grub-bootdisk-microcode.wks.in new file mode 100644 index 00000000..d83b1dfb --- /dev/null +++ b/wic/grub-bootdisk-microcode.wks.in @@ -0,0 +1,12 @@ +# short-description: Create an EFI disk image with grub-efi +# long-description: Creates a partitioned EFI disk image that the user +# can directly dd to boot media. The selected bootloader is grub-efi. +# It also includes intel-microcode as an initrd for early update support. + +part /boot --source bootimg-efi --sourceparams="loader=grub-efi,initrd=microcode.cpio" --ondisk sda --label msdos --active --align 1024 --use-uuid + +part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid + +part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid + +bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 ${APPEND}" diff --git a/wic/systemd-bootdisk-microcode.wks b/wic/systemd-bootdisk-microcode.wks deleted file mode 100644 index c171fd8e..00000000 --- a/wic/systemd-bootdisk-microcode.wks +++ /dev/null @@ -1,13 +0,0 @@ -# short-description: Create an EFI disk image with systemd-boot -# long-description: Creates a partitioned EFI disk image that the user -# can directly dd to boot media. The selected bootloader is systemd-boot. -# It also includes intel-microcode as an initrd for early update support. -# Based on OE-core's systemd-bootdisk.wks file. - -part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=microcode.cpio" --ondisk sda --label msdos --active --align 1024 --use-uuid - -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid - -part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid - -bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0" diff --git a/wic/systemd-bootdisk-microcode.wks.in b/wic/systemd-bootdisk-microcode.wks.in new file mode 100644 index 00000000..03528950 --- /dev/null +++ b/wic/systemd-bootdisk-microcode.wks.in @@ -0,0 +1,13 @@ +# short-description: Create an EFI disk image with systemd-boot +# long-description: Creates a partitioned EFI disk image that the user +# can directly dd to boot media. The selected bootloader is systemd-boot. +# It also includes intel-microcode as an initrd for early update support. +# Based on OE-core's systemd-bootdisk.wks file. + +part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=microcode.cpio" --ondisk sda --label msdos --active --align 1024 --use-uuid + +part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid + +part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid + +bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 ${APPEND}" -- cgit v1.2.3-54-g00ecf