summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2016-11-09 21:48:45 (GMT)
committerSaul Wold <sgw@linux.intel.com>2016-11-10 15:48:05 (GMT)
commitc1f260ba7fdf1a73bff897b14555ed5a11482a0e (patch)
tree7cbb56177b3bdd1ce9435b3e62aee88018815c43
parentc42dd36b541ba957511419764c36e821897e2cab (diff)
downloadmeta-intel-c1f260ba7fdf1a73bff897b14555ed5a11482a0e.tar.gz
conf/machine/intel-core*: Change WKS_FILE to systemd-bootdisk-uuid
Overriding systemd-bootdisk.wks unconditionally was against Yocto Project's compatibility requirements, so our version needed to be renamed. Change our conf files to use the renamed version. Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--conf/machine/intel-core2-32.conf2
-rw-r--r--conf/machine/intel-corei7-64.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index f7ca3e6..d0855d6 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -34,6 +34,6 @@ APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
34PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" 34PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
35 35
36IMAGE_FSTYPES += "wic" 36IMAGE_FSTYPES += "wic"
37WKS_FILE ?= "systemd-bootdisk.wks" 37WKS_FILE ?= "systemd-bootdisk-uuid.wks"
38do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" 38do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot"
39do_image_wic[recrdeptask] += "do_bootimg" 39do_image_wic[recrdeptask] += "do_bootimg"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index d28fdbf..9846795 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -33,6 +33,6 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0"
33PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" 33PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
34 34
35IMAGE_FSTYPES += "wic" 35IMAGE_FSTYPES += "wic"
36WKS_FILE ?= "systemd-bootdisk.wks" 36WKS_FILE ?= "systemd-bootdisk-uuid.wks"
37do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" 37do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot"
38do_image_wic[recrdeptask] += "do_bootimg" 38do_image_wic[recrdeptask] += "do_bootimg"