[meta-intel] [PATCH] machine confs: Use updated wks file

Saul Wold sgw at linux.intel.com
Tue Nov 8 13:12:37 PST 2016


Use the systemd-boot-uuid.wks file in order for wic to generate UUIDs
and allow for putting wic on either USB or SD, also this .wks file removes
the default console= to allow for RMC to set the console.

Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
 conf/machine/intel-core2-32.conf  | 2 +-
 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 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"
 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 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"
 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"
-- 
2.7.4



More information about the meta-intel mailing list