diff options
| -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" 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.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 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" +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 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" +bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 ${APPEND}" |