summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-03-02 21:36:02 (GMT)
committerCalifornia Sullivan <california.l.sullivan@intel.com>2018-03-06 20:53:08 (GMT)
commit958d1a20f78aae66bfa5f9f50a2409f77e81ad40 (patch)
tree0b61bdf6df0f7a141125668ac4ac92abc7b386c6
parent9a4d583c7de4634a22104ca4c88ddf0d560494b6 (diff)
downloadmeta-intel-958d1a20f78aae66bfa5f9f50a2409f77e81ad40.tar.gz
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 <california.l.sullivan@intel.com>
-rw-r--r--conf/machine/intel-core2-32.conf1
-rw-r--r--conf/machine/intel-corei7-64.conf1
2 files changed, 0 insertions, 2 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index c48023c..aa8a579 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"
32 32
33IMAGE_FSTYPES += "wic" 33IMAGE_FSTYPES += "wic"
34WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" 34WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
35WKS_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 c4ce335..78c52ee 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"
42 42
43IMAGE_FSTYPES += "wic" 43IMAGE_FSTYPES += "wic"
44WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" 44WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
45WKS_FILE_DEPENDS ?= "${WKS_FILE_DEPENDS_DEFAULT} syslinux ${EFI_PROVIDER}"