From 958d1a20f78aae66bfa5f9f50a2409f77e81ad40 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Fri, 2 Mar 2018 13:36:02 -0800 Subject: Revert "conf: override WKS_FILE_DEPENDS for intel machines" This reverts commit ab858eb989071f10f6a3796b200c6c61d42ee082. This caused no bootloader to appear in the boot partition if WKS_FILE was changed manually. Furthermore, wic wouldn't error, it would just silently ignore the missing binary. Signed-off-by: California Sullivan --- conf/machine/intel-core2-32.conf | 1 - conf/machine/intel-corei7-64.conf | 1 - 2 files changed, 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index c48023cc..aa8a5793 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf @@ -32,4 +32,3 @@ APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" IMAGE_FSTYPES += "wic" WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" -WKS_FILE_DEPENDS ?= "${WKS_FILE_DEPENDS_DEFAULT} syslinux ${EFI_PROVIDER}" diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index c4ce3359..78c52eed 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf @@ -42,4 +42,3 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0" IMAGE_FSTYPES += "wic" WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" -WKS_FILE_DEPENDS ?= "${WKS_FILE_DEPENDS_DEFAULT} syslinux ${EFI_PROVIDER}" -- cgit v1.2.3-54-g00ecf