diff options
| author |   California Sullivan <california.l.sullivan@intel.com> | 2016-11-09 13:48:45 -0800 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2016-11-10 07:48:05 -0800 |
| commit | c1f260ba7fdf1a73bff897b14555ed5a11482a0e (patch) | |
| tree | 7cbb56177b3bdd1ce9435b3e62aee88018815c43 /conf | |
| parent | c42dd36b541ba957511419764c36e821897e2cab (diff) | |
| download | meta-intel-c1f260ba7fdf1a73bff897b14555ed5a11482a0e.tar.gz meta-intel-c1f260ba7fdf1a73bff897b14555ed5a11482a0e.tar.bz2 meta-intel-c1f260ba7fdf1a73bff897b14555ed5a11482a0e.zip | |
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>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/intel-core2-32.conf | 2 | ||||
| -rw-r--r-- | conf/machine/intel-corei7-64.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index f7ca3e65..d0855d65 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" PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" IMAGE_FSTYPES += "wic" -WKS_FILE ?= "systemd-bootdisk.wks" +WKS_FILE ?= "systemd-bootdisk-uuid.wks" do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" do_image_wic[recrdeptask] += "do_bootimg" diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index d28fdbff..98467951 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" PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" IMAGE_FSTYPES += "wic" -WKS_FILE ?= "systemd-bootdisk.wks" +WKS_FILE ?= "systemd-bootdisk-uuid.wks" do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" do_image_wic[recrdeptask] += "do_bootimg" |